]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'gpio/merge' and 'spi/merge' of git://git.secretlab.ca/git/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 17 Jun 2011 17:36:32 +0000 (10:36 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 17 Jun 2011 17:36:32 +0000 (10:36 -0700)
commit504e0df57607a11a5684b99c4f190e329932bb3a
treea81ae35390d440ad1fc655ae2e8715f6fae0b652
parenta40b5b545e6c0a67219d923ddf3380b4b79a87eb
parent7dd6647240ae7296e5e62d00db6844af14b9e856
parent92cc4086f855c996b782ae438ec5238684ef1948
Merge branches 'gpio/merge' and 'spi/merge' of git://git.secretlab.ca/git/linux-2.6

* 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6:
  gpio: add GPIOF_ values regardless on kconfig settings
  gpio: include linux/gpio.h where needed
  gpio/omap4: Fix missing interrupts during device wakeup due to IOPAD.

* 'spi/merge' of git://git.secretlab.ca/git/linux-2.6:
  spi/bfin_spi: fix handling of default bits per word setting