Linus Torvalds 125aae1d7f 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

…

can

…

dvb

…

hdlc

…

hsi

…

isdn

…

mmc

…

netfilter

…

netfilter_arp

…

netfilter_bridge

…

netfilter_ipv4

…

netfilter_ipv6

…

nfsd

…

raid

…

spi

…

sunrpc

…

tc_act

…

tc_ematch

…

usb

…

wimax

…

Kbuild

…