Jiri Kosina e75d660672 Merge branch 'master' into for-next ... Merge with latest Linus' tree, as I have incoming patches that fix code that is newer than current HEAD of for-next. Conflicts: drivers/net/ethernet/realtek/r8169.c		2012-04-08 21:48:52 +02:00
..
boot	Disintegrate asm/system.h for Alpha	2012-03-28 18:11:12 +01:00
include/asm	Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping	2012-04-04 17:13:43 -07:00
kernel	Merge branch 'master' into for-next	2012-04-08 21:48:52 +02:00
lib	Disintegrate asm/system.h for Alpha	2012-03-28 18:11:12 +01:00
math-emu	alpha: change to new Makefile flag variables	2011-01-17 05:42:13 +01:00
mm	Disintegrate asm/system.h for Alpha	2012-03-28 18:11:12 +01:00
oprofile	Disintegrate asm/system.h for Alpha	2012-03-28 18:11:12 +01:00
defconfig	defconfig reduction	2010-08-14 22:26:53 +02:00
Kconfig	alpha: switch to GENERIC_PCI_IOMAP	2011-11-28 21:13:01 +02:00
Kconfig.debug
Makefile