kernel-fxtec-pro1x/include/uapi/linux
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
..
byteorder
caif UAPI: (Scripted) Disintegrate include/linux/caif 2012-10-09 09:48:40 +01:00
can UAPI: (Scripted) Disintegrate include/linux/can 2012-10-10 22:24:21 +02:00
dvb
hdlc
hsi
isdn UAPI: (Scripted) Disintegrate include/linux/isdn 2012-10-09 09:48:45 +01:00
mmc UAPI: (Scripted) Disintegrate include/linux/mmc 2012-10-11 17:27:54 -04:00
netfilter UAPI: (Scripted) Disintegrate include/linux/netfilter/ipset 2012-10-09 09:48:55 +01:00
netfilter_arp UAPI: (Scripted) Disintegrate include/linux/netfilter_arp 2012-10-09 09:48:56 +01:00
netfilter_bridge UAPI: (Scripted) Disintegrate include/linux/netfilter_bridge 2012-10-09 09:48:58 +01:00
netfilter_ipv4 UAPI: (Scripted) Disintegrate include/linux/netfilter_ipv4 2012-10-09 09:48:59 +01:00
netfilter_ipv6 UAPI: (Scripted) Disintegrate include/linux/netfilter_ipv6 2012-10-09 09:49:01 +01:00
nfsd UAPI: (Scripted) Disintegrate include/linux/nfsd 2012-10-09 09:49:02 +01:00
raid
spi
sunrpc UAPI: (Scripted) Disintegrate include/linux/sunrpc 2012-10-09 09:49:04 +01:00
tc_act UAPI: (Scripted) Disintegrate include/linux/tc_act 2012-10-09 09:49:05 +01:00
tc_ematch UAPI: (Scripted) Disintegrate include/linux/tc_ematch 2012-10-09 09:49:06 +01:00
usb
wimax UAPI: (Scripted) Disintegrate include/linux/wimax 2012-10-09 09:49:08 +01:00
Kbuild