diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2011-06-17 10:36:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2011-06-17 10:36:32 -0700 |
| commit | 0835619348b097404f4f85bc5195c6e23a2f8de4 (patch) | |
| tree | a81ae35390d440ad1fc655ae2e8715f6fae0b652 /arch | |
| parent | Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/... (diff) | |
| parent | gpio: add GPIOF_ values regardless on kconfig settings (diff) | |
| parent | spi/bfin_spi: fix handling of default bits per word setting (diff) | |
| download | linux-0835619348b097404f4f85bc5195c6e23a2f8de4.tar.gz linux-0835619348b097404f4f85bc5195c6e23a2f8de4.tar.bz2 linux-0835619348b097404f4f85bc5195c6e23a2f8de4.zip | |
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