diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-17 13:36:32 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-17 13:36:32 -0400 |
| commit | 0835619348b097404f4f85bc5195c6e23a2f8de4 (patch) | |
| tree | a81ae35390d440ad1fc655ae2e8715f6fae0b652 | |
| parent | add794467a20463d7ea50dc9f158a6371d396175 (diff) | |
| parent | c001fb72a7b705f902bdfdd05b5d2408efe6f848 (diff) | |
| parent | e479c60456ef22b0869432887216186aabaed086 (diff) | |
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