]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'staging/staging-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 04:39:42 +0000 (15:39 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 04:39:42 +0000 (15:39 +1100)
commit0b7ca956de74d297200f878204b6327499392662
treed4005b897302695385902c66c5c33f07f74b1bb8
parent913bd6974a339f7d71b300d2f5c3c01a87870395
parent951348b377385475aa256c27e1c9e2564c9ec160
Merge remote-tracking branch 'staging/staging-next'

Conflicts:
drivers/staging/et131x/et131x.c
28 files changed:
MAINTAINERS
arch/arm/mach-omap2/board-rx51-peripherals.c
drivers/gpu/drm/omapdrm/omap_connector.c
drivers/gpu/drm/omapdrm/omap_crtc.c
drivers/gpu/drm/omapdrm/omap_dmm_tiler.c
drivers/gpu/drm/omapdrm/omap_drv.c
drivers/gpu/drm/omapdrm/omap_encoder.c
drivers/gpu/drm/omapdrm/omap_fb.c
drivers/gpu/drm/omapdrm/omap_fbdev.c
drivers/gpu/drm/omapdrm/omap_gem.c
drivers/gpu/drm/omapdrm/omap_plane.c
drivers/power/generic-adc-battery.c
drivers/power/lp8788-charger.c
drivers/rtc/Kconfig
drivers/rtc/Makefile
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/android/binder.h
drivers/staging/csr/unifi_sme.c
drivers/staging/et131x/et131x.c
drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
drivers/staging/fwserial/fwserial.c
drivers/staging/iio/adc/mxs-lradc.c
drivers/staging/nvec/nvec.c
drivers/staging/omap-thermal/omap-bandgap.c
drivers/staging/speakup/selection.c
include/linux/pci_ids.h
include/linux/spi/spi.h