aha/arch/blackfin
David S. Miller 3505d1a9fd Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
	drivers/net/sfc/sfe4001.c
	drivers/net/wireless/libertas/cmd.c
	drivers/staging/Kconfig
	drivers/staging/Makefile
	drivers/staging/rtl8187se/Kconfig
	drivers/staging/rtl8192e/Kconfig
2009-11-18 22:19:03 -08:00
..
boot kbuild: use INSTALLKERNEL to select customized installkernel script 2009-09-20 12:18:14 +02:00
configs Blackfin: increase default async timings for parallel flashes 2009-09-16 22:10:42 -04:00
include/asm Blackfin: fix framebuffer mmap bug for nommu 2009-10-08 00:58:15 -04:00
kernel headers: remove sched.h from interrupt.h 2009-10-11 11:20:58 -07:00
lib Blackfin: mass clean up of copyright/licensing info 2009-10-07 04:36:26 -04:00
mach-bf518 Blackfin: drop all simple-gpio board resources 2009-10-08 00:58:18 -04:00
mach-bf527 Blackfin: drop all simple-gpio board resources 2009-10-08 00:58:18 -04:00
mach-bf533 Blackfin: drop all simple-gpio board resources 2009-10-08 00:58:18 -04:00
mach-bf537 Blackfin: drop all simple-gpio board resources 2009-10-08 00:58:18 -04:00
mach-bf538 Blackfin: drop all simple-gpio board resources 2009-10-08 00:58:18 -04:00
mach-bf548 Blackfin: drop all simple-gpio board resources 2009-10-08 00:58:18 -04:00
mach-bf561 Blackfin: drop all simple-gpio board resources 2009-10-08 00:58:18 -04:00
mach-common Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2009-11-18 22:19:03 -08:00
mm Blackfin: mass clean up of copyright/licensing info 2009-10-07 04:36:26 -04: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 Blackfin: convert to GENERIC_HARDIRQS_NO__DO_IRQ 2009-10-08 00:58:20 -04:00
Kconfig.debug Blackfin: add some isram-driver self tests 2009-09-16 22:10:36 -04:00
Makefile kbuild: use INSTALLKERNEL to select customized installkernel script 2009-09-20 12:18:14 +02:00