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)
commit0835619348b097404f4f85bc5195c6e23a2f8de4
treea81ae35390d440ad1fc655ae2e8715f6fae0b652
parentadd794467a20463d7ea50dc9f158a6371d396175
parentc001fb72a7b705f902bdfdd05b5d2408efe6f848
parente479c60456ef22b0869432887216186aabaed086
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