Ingo Molnar 7fd52392c5 Merge branch 'linus' into perf/urgent ... Merge reason: we need to fix a non-trivial merge conflict. Signed-off-by: Ingo Molnar <mingo@elte.hu>		2012-03-26 17:19:03 +02:00
..
acpi
asm-generic	The following text was taken from the original review request:	2012-03-24 10:08:39 -07:00
crypto	crypto: remove the second argument of k[un]map_atomic()	2012-03-20 21:48:16 +08:00
drm	The following text was taken from the original review request:	2012-03-24 10:08:39 -07:00
keys
linux	Merge branch 'linus' into perf/urgent	2012-03-26 17:19:03 +02:00
math-emu
media	The following text was taken from the original review request:	2012-03-24 10:41:37 -07:00
misc
mtd
net	The following text was taken from the original review request:	2012-03-24 10:41:37 -07:00
pcmcia
rdma	Merge branches 'cma', 'cxgb3', 'cxgb4', 'ehca', 'iser', 'mad', 'nes', 'qib', 'srp' and 'srpt' into for-next	2012-03-19 09:50:33 -07:00
rxrpc
scsi	The following text was taken from the original review request:	2012-03-24 10:41:37 -07:00
sound	The following text was taken from the original review request:	2012-03-24 10:41:37 -07:00
target
trace	The following text was taken from the original review request:	2012-03-24 10:41:37 -07:00
video	fbdev: sh_mipi_dsi: add extra phyctrl for sh_mipi_dsi_info	2012-03-21 07:24:01 +00:00
xen	One tiny feature that accidentally got lost in the initial git pull:	2012-03-24 12:20:25 -07:00
Kbuild