Arnd Bergmann e067096c8d Merge branch 'tegra/soc' into next/boards ... Conflicts: arch/arm/mach-tegra/board-harmony-pcie.c To fix an internal merge conflict between the tegra/soc and tegra/boards branches. Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2012-01-06 23:09:14 +00:00
..
alpha	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
arm	Merge branch 'tegra/soc' into next/boards	2012-01-06 23:09:14 +00:00
avr32	Merge git://git.infradead.org/mtd-2.6	2011-11-07 09:11:16 -08:00
blackfin	blackfin: Fixup export.h includes	2011-11-14 17:15:23 +08:00
cris	net: Fix references to deleted NET_ETHERNET Kconfig setting.	2011-11-09 19:26:53 -05:00
frv	kgdb: follow rename pack_hex_byte() to hex_byte_pack()	2011-10-31 17:30:56 -07:00
h8300	Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6	2011-10-29 07:27:45 -07:00
hexagon	Hexagon: Add basic stacktrace functionality for Hexagon architecture.	2011-11-01 07:34:21 -07:00
ia64	Merge branch 'upstream/xen-settime' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen	2011-11-06 20:15:05 -08:00
m32r	Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2011-11-06 18:54:53 -08:00
m68k	m68k: Wire up process_vm_{read,write}v	2011-12-06 20:37:58 +01:00
microblaze	microblaze: bury asm/namei.h	2011-11-21 16:48:28 -05:00
mips	Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2011-12-05 16:54:00 -08:00
mn10300	kgdb: follow rename pack_hex_byte() to hex_byte_pack()	2011-10-31 17:30:56 -07:00
openrisc	Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2011-11-06 18:54:53 -08:00
parisc	parisc: Add export.h to files needing EXPORT_SYMBOL/THIS_MODULE	2011-10-31 19:31:00 -04:00
powerpc	powerpc/44x: Add mtd ndfc to the ppx44x defconfig	2011-11-25 10:06:00 +11:00
s390	[S390] remove reset of system call restart on psw changes	2011-12-01 13:32:17 +01:00
score	score: drop unused Kconfig symbols	2011-10-31 23:39:51 +01:00
sh	Merge branches 'sh/pm-runtime' and 'common/clkfwk' into sh-fixes-for-linus	2011-11-11 16:16:25 +09:00
sparc	sparc32: Be less strict in matching %lo part of relocation.	2011-12-14 10:57:28 -08:00
tile	arch/tile: use new generic {enable,disable}_percpu_irq() routines	2011-12-03 15:31:49 -05:00
um	Merge branch 'for-linus' of git://github.com/richardweinberger/linux	2011-11-02 09:45:39 -07:00
unicore32	unicore32, exec: remove redundant set_fs(USER_DS)	2011-11-16 10:50:09 +08:00
x86	Merge branch 'stable/for-linus-fixes-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen	2011-12-15 10:52:40 -08:00
xtensa	Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2011-10-26 17:15:03 +02:00
.gitignore
Kconfig	Add Kconfig option ARCH_HAVE_NMI_SAFE_CMPXCHG	2011-08-03 11:12:37 -04:00