| commit | 125aae1d7f51ee28d821a1374a2b7be13972c5dc | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Oct 13 11:07:40 2012 +0900 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Oct 13 11:07:40 2012 +0900 |
| tree | cd366e9940f8fdff1c8dc23eaac2ec9b272b9fa3 | |
| parent | 79c63eeb805d086f52e5efda9c8d321beeed0b2b [diff] | |
| parent | 60fe5771be6aa3f37d5887aa01c04f733130a559 [diff] |
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