]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'staging/staging-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Nov 2012 04:09:35 +0000 (15:09 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Nov 2012 04:09:35 +0000 (15:09 +1100)
commitc60cf4ea6212d577b1ad7a03a1eff64391a9033c
tree065b44059306400cafb077420f5779ec964dbd28
parent2adb1d7c64b10e3ad626f0a775227ac5858261ef
parentbe3c5126b553cc807d112a5010a10f8e5bee5427
Merge remote-tracking branch 'staging/staging-next'

Conflicts:
drivers/iio/adc/Kconfig
drivers/iio/adc/Makefile
drivers/iio/adc/Kconfig
drivers/iio/adc/Makefile
drivers/staging/dgrp/dgrp_net_ops.c
drivers/staging/dgrp/dgrp_sysfs.c
drivers/staging/omap-thermal/omap-thermal-common.c