]> git.openfabrics.org - ~shefty/rdma-dev.git/commit
Merge tag 'v3.6-rc6' into spi-drivers
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 25 Sep 2012 12:37:05 +0000 (13:37 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 25 Sep 2012 12:37:05 +0000 (13:37 +0100)
commit8e5d0661b3948f3c5a143f32d192710375822af2
treeca18920d3f7219f7ffb7ca2fa372b82558938006
parent39a6ac11df6579df0361922f05c43f0fac8daa37
parent5698bd757d55b1bb87edd1a9744ab09c142abfc2
Merge tag 'v3.6-rc6' into spi-drivers

Linux 3.6-rc6

Conflicts:
drivers/spi/spi-omap2-mcspi.c
drivers/spi/spi-omap2-mcspi.c
drivers/spi/spi-pl022.c
drivers/spi/spi-s3c64xx.c