Jiri Kosina 318ae2edc3 Merge branch 'for-next' into for-linus ... Conflicts: Documentation/filesystems/proc.txt arch/arm/mach-u300/include/mach/debug-macro.S drivers/net/qlge/qlge_ethtool.c drivers/net/qlge/qlge_main.c drivers/net/typhoon.c		2010-03-08 16:55:37 +01:00
..
boot	Blackfin: add an uncompressed vmImage target	2009-12-15 00:15:08 -05:00
configs	Blackfin: add support for the Acvilon BF561 board	2009-12-15 00:15:10 -05:00
include/asm	Fix spelling of 'platform' in comments and doc	2010-02-05 12:22:34 +01:00
kernel	blackfin,kgdb: Do not put PC in gdb_regs into retx.	2010-01-07 11:58:37 -06:00
lib	Blackfin: convert to generic checksum code	2009-12-15 00:13:32 -05:00
mach-bf518	Blackfin: BF51x: unify def/cdef headers	2009-12-15 00:16:16 -05:00
mach-bf527	Blackfin: BF52x: unify def/cdef headers	2009-12-15 00:16:13 -05:00
mach-bf533	Blackfin: ip0x: pull in asm/portmux.h for P_xxx defines	2009-12-15 00:16:44 -05:00
mach-bf537	Blackfin: drop unused ax88180 resources	2009-12-15 00:16:43 -05:00
mach-bf538	Blackfin: bf537-stamp: add CAN resources	2009-12-15 00:16:38 -05:00
mach-bf548	Blackfin: bf537-stamp: add CAN resources	2009-12-15 00:16:38 -05:00
mach-bf561	Blackfin: drop unused ax88180 resources	2009-12-15 00:16:43 -05:00
mach-common	Merge branch 'master' into percpu	2010-01-05 09:17:33 +09:00
mm	blackfin,kgdb,probe_kernel: Cleanup probe_kernel_read/write	2010-01-07 11:58:36 -06: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	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin	2009-12-16 10:52:35 -08:00
Kconfig.debug	Blackfin: add some isram-driver self tests	2009-09-16 22:10:36 -04:00
Makefile	Blackfin: force BFD target when linking modules	2009-12-15 00:15:25 -05:00