projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 79c63ee 60fe577)
Merge tag 'mmc-merge-for-3.7-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Oct 2012 02:07:40 +0000 (11:07 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Oct 2012 02:07:40 +0000 (11:07 +0900)
commit125aae1d7f51ee28d821a1374a2b7be13972c5dc
treecd366e9940f8fdff1c8dc23eaac2ec9b272b9fa3tree | snapshot
parent79c63eeb805d086f52e5efda9c8d321beeed0b2bcommit | diff
parent60fe5771be6aa3f37d5887aa01c04f733130a559commit | diff
Merge tag 'mmc-merge-for-3.7-rc1-part2' of git://git./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
John Crispins staging tree