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

..

boot

microblaze/of: Use generic rule to build dtb's

2010-12-23 14:59:52 -07:00

configs

kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT

2011-01-20 17:02:05 -08:00

include/asm

Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6

2011-04-07 11:14:49 -07:00

kernel

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

lib

Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6

2011-04-07 11:14:49 -07:00

mm

microblaze: Fix sparse warning - fault.c

2011-03-09 08:09:59 +01:00

oprofile

microblaze: Core oprofile configs and hooks

2009-12-14 08:45:07 +01:00

pci

Fix common misspellings

2011-03-31 11:26:23 -03:00

platform

Fix common misspellings

2011-03-31 11:26:23 -03:00

Kconfig

usb: Fix Kconfig unmet dependencies for Microblaze EHCI

2011-04-13 15:43:59 -07:00

Kconfig.debug

microblaze: remove obsolete DEBUG_BOOTMEM

2011-01-10 09:29:51 +01:00

Makefile

Fix common misspellings

2011-03-31 11:26:23 -03:00