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	Blackfin: encode cpu-rev into uImage name	2011-01-10 07:18:27 -05:00
configs	Blackfin: defconfigs: update after misc devices defaulted to N	2011-03-25 16:54:12 -04:00
include	Blackfin: SMP: make all barriers handle cache issues	2011-04-13 19:34:04 -04: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	Fix common misspellings	2011-03-31 11:26:23 -03:00
mach-bf518	Blackfin: punt unused HDMA masks	2011-03-18 04:29:17 -04:00
mach-bf527	Blackfin: punt unused HDMA masks	2011-03-18 04:29:17 -04:00
mach-bf533	Blackfin: ip0x: fix unused variable warning	2011-03-18 05:17:02 -04:00
mach-bf537	Fix common misspellings	2011-03-31 11:26:23 -03:00
mach-bf538	Blackfin: boards: add missing "static" to peripheral lists	2011-01-10 07:18:25 -05:00
mach-bf548	Blackfin: bf54x: re-enable anomaly 05000353 for all revs	2011-03-22 21:06:16 -04:00
mach-bf561	bfin: Final irq cleanup	2011-03-29 14:47:59 +02:00
mach-common	Blackfin: SMP: fix cache flush loop	2011-04-13 19:34:06 -04:00
mm	Blackfin: sram_free_with_lsl: do not ignore return value of sram_free	2011-01-10 07:18:26 -05:00
oprofile	Blackfin arch: remove hardware PM code, oprofile not use it	2009-01-07 23:14:39 +08:00
ADI_BSD.txt	Blackfin: mass clean up of copyright/licensing info	2009-10-07 04:36:26 -04:00
Kconfig	genirq: Remove the now obsolete config options and select statements	2011-03-30 14:13:23 +02:00
Kconfig.debug	Fix common misspellings	2011-03-31 11:26:23 -03:00
Makefile	Blackfin: encode cpu-rev into uImage name	2011-01-10 07:18:27 -05:00