Thomas Gleixner a18f22a968 Merge branch 'consolidate-clksrc-i8253' of master.kernel.org:~rmk/linux-2.6-arm into timers/clocksource ... Conflicts: arch/ia64/kernel/cyclone.c arch/mips/kernel/i8253.c arch/x86/kernel/i8253.c Reason: Resolve conflicts so further cleanups do not conflict further Signed-off-by: Thomas Gleixner <tglx@linutronix.de>		2011-05-14 12:06:36 +02:00
..
acpi	Fix common misspellings	2011-03-31 11:26:23 -03:00
asm-generic	Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6	2011-04-07 11:14:49 -07:00
crypto
drm	drm/radeon/kms: fix gart setup on fusion parts (v2)	2011-05-04 10:16:40 +10:00
keys	libceph: Create a new key type "ceph".	2011-03-29 12:11:24 -07:00
linux	Merge branch 'consolidate-clksrc-i8253' of master.kernel.org:~rmk/linux-2.6-arm into timers/clocksource	2011-05-14 12:06:36 +02:00
math-emu
media	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6	2011-04-27 15:17:52 -07:00
mtd
net	net/9p: nwname should be an unsigned int	2011-04-15 15:26:15 -05:00
pcmcia	pcmcia: re-enable Zoomed Video support	2011-02-20 12:47:34 +01:00
rdma
rxrpc	Fix common misspellings	2011-03-31 11:26:23 -03:00
scsi	Fix common misspellings	2011-03-31 11:26:23 -03:00
sound	Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6	2011-04-07 11:14:49 -07:00
staging	[media] Altera FPGA firmware download module	2011-03-21 20:32:16 -03:00
target	Fix common misspellings	2011-03-31 11:26:23 -03:00
trace	block: make unplug timer trace event correspond to the schedule() unplug	2011-04-16 13:51:05 +02:00
video	Fix common misspellings	2011-03-31 11:26:23 -03:00
xen	Fix common misspellings	2011-03-31 11:26:23 -03:00
Kbuild