]> git.openfabrics.org - ~shefty/rdma-dev.git/commit
Merge tag 'v3.6-rc6' into spi-mxs
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 25 Sep 2012 12:41:02 +0000 (13:41 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 25 Sep 2012 12:41:02 +0000 (13:41 +0100)
commitac48f6cb5f268daff06b636444819e5ffb462611
tree56bcc8b2de42738764ac65056067a17cb97609f4
parente64d07a2dae569fc3c938adac777562a1d6f151e
parent5698bd757d55b1bb87edd1a9744ab09c142abfc2
Merge tag 'v3.6-rc6' into spi-mxs

Linux 3.6-rc6

Conflicts (overlap between moving code that accesses registers around
and factoring the register access out into a SSP layer):
drivers/mmc/host/mxs-mmc.c
drivers/mmc/host/mxs-mmc.c