diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-22 12:59:47 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-22 12:59:47 -0800 |
| commit | b3b1b70e62a603f473619dbebc3b3d23f535e6f8 (patch) | |
| tree | b55a3780731a5b153321bc3d94c9f09219e34ff2 /net/bridge/br_netfilter.c | |
| parent | Merge branch 'upstream-linus' of git://github.com/jgarzik/libata-dev (diff) | |
| parent | Merge branch 'for-greg' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus (diff) | |
| download | linux-dev-b3b1b70e62a603f473619dbebc3b3d23f535e6f8.tar.xz linux-dev-b3b1b70e62a603f473619dbebc3b3d23f535e6f8.zip | |
Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
* 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
USB: Fix usb/isp1760 build on sparc
usb: gadget: epautoconf: do not change number of streams
usb: dwc3: core: fix cached revision on our structure
usb: musb: fix reset issue with full speed device
Diffstat (limited to 'net/bridge/br_netfilter.c')
0 files changed, 0 insertions, 0 deletions