| commit | 08d63aac436b2ad35d9e864b9ebb05bc8b9bb653 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Jun 12 11:03:29 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Jun 12 11:03:29 2011 -0700 |
| tree | c72495139623f39b870fddab0aa366db79988b6d | |
| parent | 152b92db7ad2c6d6c11c8eab07e90b73a90c8b76 [diff] | |
| parent | e5ea3f12d41d96edf4ad9374db2b1725e457acec [diff] |
Merge branch 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6 * 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6: gpio/basic_mmio: add missing include of spinlock_types.h gpio/nomadik: fix sleepmode for elder Nomadik