Linus Torvalds 125aae1d7f - Disintegrate UAPI, fix a mismerge that caused a build error. ... -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIbBAABAgAGBQJQdz1DAAoJEHNBYZ7TNxYMjNUP9Aj4V22WhjSlb4c/6E4ocRnT Iy1RP2m9omVbDkqfERFdtkCfFYhWBugJjqwnT3pRM7MRMhG0Cx0kmhkji6sgtjez nZ7pocwGU9BoJUe/iKKq9pynfVc+AWZr4tTUXlpBQUs8b7BVZw/Fx3N9inPaUbHh SieAsnbFPkb9GHqOxgFxenjhTvBdlN/SEgOHfuQtH01B85qZNW64e3fAufZDGlRW jOHSP7XwEiLq7lbvMKxqk9El9hUO4uEsfh3OltgMzcsmglQ/YgPZAJ8MtQF/Q501 BLLCh9of00RJ3+Ug0x4uRu4z+Dl/+26gcIbOE2EvcmthNsd+ln12Ek0Mug+1Hl9B W+1nbMkLTH7J85lnKfUcZ+AId5YOwInZw1pojNN4OA6wZIFfXhTLp6oTy+MCZHoD UqwDMF+4em2XBTmMRtmTkyRoz3809kZR0eDxLhHsu0B2oblr9ZO+Li2uf+h3/D2R HKe0WHICRHEuc9sipHCBZiC6rNGwWQQ32DMu1NeL3u4re84Ft3FBO82ELQWPVjr6 p1/bz4AXIsa+vm/3bAO/0qdbbOHSXXWN7YC2YmIuSx5MwbdZJuGra7X24GdbOPwU 64QBR3f/Yz9eJgH5W97HXK6nQinozq3yrLdODquJpmdrNKjWTyqAW/gb76hNMkdh Qt711FxffztYXqK/Aug= =8cyJ -----END PGP SIGNATURE----- Merge tag 'mmc-merge-for-3.7-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc Pull two more mmc changes from Chris Ball: - Disintegrate UAPI - fix a mismerge that caused a build error. * tag 'mmc-merge-for-3.7-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: UAPI: (Scripted) Disintegrate include/linux/mmc mmc: mxs-mmc: Fix merge issue causing build error		2012-10-13 11:07:40 +09:00
..
acpi	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux	2012-10-08 07:14:06 +09:00
asm-generic	Merge branch 'akpm' (Andrew's patch-bomb)	2012-10-09 16:23:15 +09:00
clocksource	arm64: Generic timers support	2012-09-17 13:42:20 +01:00
crypto
drm	Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-next	2012-10-07 21:13:54 +10:00
keys
linux	- Disintegrate UAPI, fix a mismerge that caused a build error.	2012-10-13 11:07:40 +09:00
math-emu
media	Merge branch 'exynos-drm-next' of git://git.infradead.org/users/kmpark/linux-samsung into drm-next	2012-10-07 21:06:33 +10:00
memory
misc
mtd	UAPI: (Scripted) Disintegrate include/mtd	2012-10-09 09:49:09 +01:00
net	ipv4: Add FLOWI_FLAG_KNOWN_NH	2012-10-08 17:42:36 -04:00
pcmcia
ras
rdma	infiniband: pass rdma_cm module to netlink_dump_start	2012-10-07 00:30:56 -04:00
rxrpc
scsi	SCSI misc on 20121012	2012-10-13 10:57:01 +09:00
sound	Sound updates for 3.7-rc1	2012-10-09 07:07:14 +09:00
target	target: Add target_submit_cmd_map_sgls for SGL fabric memory passthrough	2012-10-02 14:16:08 -07:00
trace	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs	2012-10-10 10:49:20 +09:00
uapi	- Disintegrate UAPI, fix a mismerge that caused a build error.	2012-10-13 11:07:40 +09:00
video	fbdev updates for 3.7	2012-10-12 10:21:02 +09:00
xen	Feature:	2012-10-12 22:20:28 +09:00
Kbuild