iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
125aae1d7f
linux/include/uapi
History
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
..
asm-generic UAPI: (Scripted) Disintegrate include/asm-generic 2012-10-04 18:20:15 +01:00
drm UAPI: (Scripted) Disintegrate include/drm 2012-10-04 18:21:50 +01:00
linux - Disintegrate UAPI, fix a mismerge that caused a build error. 2012-10-13 11:07:40 +09:00
mtd UAPI: (Scripted) Disintegrate include/mtd 2012-10-09 09:49:09 +01:00
rdma UAPI: (Scripted) Set up UAPI Kbuild files 2012-10-02 18:01:35 +01:00
scsi UAPI: (Scripted) Set up UAPI Kbuild files 2012-10-02 18:01:35 +01:00
sound UAPI: (Scripted) Set up UAPI Kbuild files 2012-10-02 18:01:35 +01:00
video UAPI: (Scripted) Set up UAPI Kbuild files 2012-10-02 18:01:35 +01:00
xen UAPI: (Scripted) Set up UAPI Kbuild files 2012-10-02 18:01:35 +01:00
Kbuild UAPI: (Scripted) Set up UAPI Kbuild files 2012-10-02 18:01:35 +01:00