Colin Cross 633c6f1b21 Merge commit 'v3.4.5' into android-3.4 ... Conflicts: drivers/base/power/main.c Change-Id: I0c7d106d2de75d0e40f167245ad4cc37e1556bb0		2012-07-16 15:25:51 -07:00
..
acpi	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux	2012-05-05 10:06:06 -07:00
asm-generic	thp: avoid atomic64_read in pmd_read_atomic for 32bit PAE	2012-07-16 09:04:42 -07:00
crypto	crypto: user - Fix lookup of algorithms with IV generator	2012-03-29 19:52:47 +08:00
drm	drm/radeon/kms: add new SI PCI ids	2012-06-10 00:36:18 +09:00
keys
linux	Merge commit 'v3.4.5' into android-3.4	2012-07-16 15:25:51 -07:00
math-emu
media	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2012-05-14 11:23:37 -07:00
misc
mtd
net	Merge commit 'v3.4.5' into android-3.4	2012-07-16 15:25:51 -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	SCSI: libsas: fix taskfile corruption in sas_ata_qc_fill_rtf	2012-07-16 09:04:37 -07:00
sound	ALSA: hda - hide HDMI/ELD printks unless snd.debug=2	2012-04-10 14:53:55 +02:00
target
trace	Merge tag 'pm-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm into android-3.4	2012-06-05 18:06:54 -07:00
video	Merge branch 'platforms' of git://git.linaro.org/people/rmk/linux-arm	2012-03-27 18:17:02 -07:00
xen	xen: do not map the same GSI twice in PVHVM guests.	2012-06-01 15:18:25 +08:00
Kbuild