diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-15 17:07:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-15 17:07:48 -0700 |
| commit | 8e53ed10f871a077cc61374c74e0bbab25264208 (patch) | |
| tree | 13c12409e016c7ea9fba8a4aa7ef5329b289444a /drivers/usb/gadget/mv_udc_core.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc (diff) | |
| parent | drivers/ide/ide-cs.c: adjust suspicious bit operation (diff) | |
| download | linux-dev-8e53ed10f871a077cc61374c74e0bbab25264208.tar.xz linux-dev-8e53ed10f871a077cc61374c74e0bbab25264208.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
Pull IDE fixes from David S. Miller:
1) Two fixes to icside, one for a build failure and another for a
warning. From Christian Dietrich.
2) Fix a bit operation that did erroneous masking, from Julia Lawall.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
drivers/ide/ide-cs.c: adjust suspicious bit operation
ide: icside.c: fix printk format string compile warning
ide: icside.c: Fix compile with CONFIG_BLK_DEV_IDEDMA_ICS=n
Diffstat (limited to 'drivers/usb/gadget/mv_udc_core.c')
0 files changed, 0 insertions, 0 deletions