Merge 3.8-rc5 into driver-core-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 26 Jan 2013 05:06:30 +0000 (21:06 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 26 Jan 2013 05:06:30 +0000 (21:06 -0800)
commit422d26b6ecd77af8c77f2a40580679459825170f
tree632e690e458fb7b27db200cd6fcd5429e143e419
parent4c271bb67c04253c1e99006eb48fb773a8fe8c0f
parent949db153b6466c6f7cad5a427ecea94985927311
Merge 3.8-rc5 into driver-core-next

This resolves a gpio driver merge issue pointed out in linux-next.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/cpufreq/Kconfig.x86
drivers/dma/imx-dma.c
drivers/dma/tegra20-apb-dma.c
drivers/gpio/gpio-mvebu.c
drivers/i2c/busses/i2c-omap.c
drivers/i2c/busses/i2c-sirf.c
drivers/media/platform/s5p-mfc/s5p_mfc.c
drivers/staging/iio/adc/mxs-lradc.c
drivers/usb/host/ehci-mxc.c