tree 13c12409e016c7ea9fba8a4aa7ef5329b289444a
parent 06da03510e0cf669a2c434484b90c0ab09d2b086
parent e58c5de8f59d124907c993ea3126c69493b7eec7
author Linus Torvalds <torvalds@linux-foundation.org> 1339805268 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1339805268 -0700

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