Linus Torvalds
ba01a87e37
Merge branch 'usb-target-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending ...
Pull usb-gadget scsi-target merge from Nicholas Bellinger:
"As promised, here is the pull request for Sebastian's usb-gadget
target UASP / BOT driver for v3.5-rc1. This code has been in
linux-next for a number of weeks, and is now ready for an initial
merge.
This fabric uses the target framework to provide a usb gadget device.
This gadget supports the USB Attached SCSI Protocol (UASP) and Bulk
Only Transfers (BOT or BBB). BOT is the primary interface, UAS is the
alternative interface.
Note this series is dependent upon a single target core patch for
adding se_cmd->unknown_data_length in target-pending/for-next, that
got merged in the parent.
Kudos to Sebastian for making this driver happen so easily, and for
his patches to improve usb-core and target core along the way to his
goal. Also thanks to Felipe + Greg-KH for their help in getting this
driver ready for mainline."
* 'usb-target-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
usb-gadget: Initial merge of target module for UASP + BOT
2012-05-21 17:40:42 -07:00
ACPI / PCI / PM: Fix device PM regression related to D3hot/D3cold
2012-05-17 16:16:16 -07:00
AMBA: get rid of last two uses of NO_IRQ
2012-05-03 11:33:15 +01:00
Change summary:
2012-05-03 17:16:52 -07:00
skb: Add inline helper for getting the skb end offset from head
2012-05-06 13:13:19 -04:00
regmap: Fix typo in IRQ register striding
2012-05-17 22:59:24 +01:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-05-20 21:53:04 -04:00
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
2012-04-27 15:16:43 -04:00
virtio: console: tell host of open ports after resume from s3/s4
2012-05-17 12:14:33 +03:00
CLKDEV: provide helpers for common clock framework
2012-05-02 09:30:32 +01:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
2012-05-21 12:41:17 -07:00
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
2012-05-17 09:57:13 -07:00
efivars: Improve variable validation
2012-05-03 17:19:19 -07:00
gpio/exynos: Fix compiler warnings when non-exynos machines are selected
2012-05-11 18:25:53 -06:00
drm/nouveau/i2c: resume use of i2c-algo-bit, rather than custom stack
2012-05-07 11:02:38 +01:00
HSI: hsi_char: Remove max_data_size from sysfs
2012-04-23 14:23:32 +03:00
hwmon: (coretemp) Increase CPU core limit
2012-05-01 09:16:14 -07:00
i2c: mxs: disable QUEUE when sending is done
2012-04-27 16:13:29 +02:00
drivers/ieee802154: IEEE 802.15.4 loopback driver
2012-05-16 15:17:08 -04:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2012-05-21 17:37:09 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2012-04-30 10:13:48 -07:00
isdn: remove duplicate NULL check
2012-05-17 04:47:50 -04:00
drivers/leds: correct __devexit annotations
2012-05-10 15:06:44 -07:00
A fix to the thin provisioning userspace interface.
2012-05-18 18:22:45 -07:00
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2012-05-14 11:23:37 -07:00
tokenring: delete all remaining driver support
2012-05-15 20:23:16 -04:00
regulator updates for 3.5
2012-05-21 16:49:16 -07:00
Merge branches 'amba', 'devel-stable', 'fixes', 'mach-types', 'mmci', 'pci' and 'versatile' into for-linus
2012-05-21 15:15:10 +01:00
Three fixes for 3.4:
2012-05-13 11:33:09 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
2012-05-21 12:43:54 -07:00
Pin control subsystem changes for kernel 3.5:
2012-05-21 16:58:23 -07:00
parisc: move definition of PAGE0 to asm/page.h
2012-05-10 15:12:08 -07:00
PCI changes for the 3.5 merge window:
2012-05-21 16:24:54 -07:00
pinctrl: pinctrl-imx: add imx51 pinctrl driver
2012-05-20 21:00:41 +02:00
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-05-06 12:19:38 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-05-16 22:17:37 -04:00
regulator updates for 3.5
2012-05-21 16:49:16 -07:00
remoteproc: fix off-by-one bug in __rproc_free_vrings
2012-05-13 23:15:42 +03:00
drivers/rtc/rtc-pl031.c: configure correct wday for 2000-01-01
2012-05-17 18:00:51 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
2012-05-21 12:41:17 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
2012-05-21 12:43:54 -07:00
spi/spi-bfin5xx: Fix flush of last bit after each spi transfer
2012-04-27 12:20:39 -06:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-05-07 23:35:40 -04:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2012-05-21 17:37:09 -07:00
tty: Fix LED error return
2012-05-14 10:43:24 -07:00
Merge branch 'usb-target-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2012-05-21 17:40:42 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-05-16 22:17:37 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-05-12 12:57:01 -07:00
virtio: balloon: let host know of updated balloon size before module removal
2012-05-17 12:14:34 +03:00
hpwdt: Only BYTE reads/writes to WD Timer port 0x72
2012-04-26 14:38:07 +02:00
xen/Kconfig: fix Kconfig layout
2012-05-07 12:26:28 -04:00
ba01a87e37