]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'workqueues/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 22 Aug 2012 04:44:21 +0000 (14:44 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 22 Aug 2012 04:44:21 +0000 (14:44 +1000)
commit5a4c1c83ce4e9868e5bbdb77eebc6d8a1ebacf76
treefa5d9db6fd5be516686c12125b62be9a55ce3e47
parente5dd662952cb8f90cfde50d0713b626142a25f0e
parent136b5721d75a62a8f02c601c89122e32c1a85a84
Merge remote-tracking branch 'workqueues/for-next'

Conflicts:
drivers/hid/hid-picolcd.c
33 files changed:
block/genhd.c
drivers/cpufreq/cpufreq_conservative.c
drivers/leds/leds-lp8788.c
drivers/media/dvb-core/dvb_net.c
drivers/media/pci/bt8xx/bttv-driver.c
drivers/media/pci/cx18/cx18-driver.c
drivers/media/pci/cx23885/cx23885-input.c
drivers/media/pci/cx88/cx88-mpeg.c
drivers/media/pci/mantis/mantis_evm.c
drivers/media/pci/mantis/mantis_uart.c
drivers/media/pci/saa7134/saa7134-core.c
drivers/media/pci/saa7134/saa7134-empress.c
drivers/media/platform/omap24xxcam.c
drivers/media/usb/cx231xx/cx231xx-cards.c
drivers/media/usb/em28xx/em28xx-cards.c
drivers/media/usb/tm6000/tm6000-cards.c
drivers/mtd/mtdoops.c
drivers/net/ethernet/mellanox/mlx4/sense.c
drivers/net/virtio_net.c
drivers/net/wireless/ipw2x00/ipw2100.c
drivers/platform/x86/thinkpad_acpi.c
drivers/regulator/core.c
drivers/scsi/ipr.c
drivers/thermal/thermal_sys.c
drivers/tty/serial/kgdboc.c
drivers/usb/gadget/u_ether.c
fs/gfs2/super.c
kernel/timer.c
mm/slab.c
net/9p/trans_fd.c
net/core/dst.c
sound/pci/oxygen/oxygen_lib.c
sound/soc/soc-core.c