diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-13 11:07:40 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-13 11:07:40 +0900 |
| commit | 125aae1d7f51ee28d821a1374a2b7be13972c5dc (patch) | |
| tree | cd366e9940f8fdff1c8dc23eaac2ec9b272b9fa3 /include/media | |
| parent | Merge tag 'dm-3.7-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-dm (diff) | |
| parent | UAPI: (Scripted) Disintegrate include/linux/mmc (diff) | |
| download | linux-dev-125aae1d7f51ee28d821a1374a2b7be13972c5dc.tar.xz linux-dev-125aae1d7f51ee28d821a1374a2b7be13972c5dc.zip | |
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
Diffstat (limited to 'include/media')
0 files changed, 0 insertions, 0 deletions