]> 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)
commit7f43e4da6b28f90e6d2432ba6bf37430a541e566
treea81ae35390d440ad1fc655ae2e8715f6fae0b652
parent6484b5b90cad7e1166dbc299f46c0c33b1f2bd10
parentbebd663d1dcae71002747cb042e4cc6546d8df99
parentebf0f89dc8d232f40eba86ef5473c18201f4137f
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