]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'char-misc/char-misc-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 04:43:27 +0000 (15:43 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 04:43:27 +0000 (15:43 +1100)
commit8cdeb21fd2facf5fc7b03128f09f21f69bc11fcc
tree7b7de5c37ae35900ce2ddf4083cb9b6206e39cf9
parent0b7ca956de74d297200f878204b6327499392662
parent29e5507ae4ab34397f538f06b7070c81a4e4a2bf
Merge remote-tracking branch 'char-misc/char-misc-next'

Conflicts:
drivers/char/pcmcia/synclink_cs.c
drivers/ipack/devices/ipoctal.c
drivers/mfd/wm5102-tables.c
include/linux/mfd/arizona/pdata.h
13 files changed:
MAINTAINERS
drivers/Kconfig
drivers/Makefile
drivers/char/hw_random/exynos-rng.c
drivers/char/pcmcia/synclink_cs.c
drivers/ipack/devices/ipoctal.c
drivers/mfd/wm5102-tables.c
drivers/misc/Kconfig
drivers/mmc/host/Kconfig
drivers/net/Kconfig
drivers/net/hyperv/netvsc_drv.c
include/linux/mfd/arizona/pdata.h
include/linux/mfd/arizona/registers.h