Merge branch 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 12 Jun 2011 18:03:29 +0000 (11:03 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 12 Jun 2011 18:03:29 +0000 (11:03 -0700)
commit08d63aac436b2ad35d9e864b9ebb05bc8b9bb653
treec72495139623f39b870fddab0aa366db79988b6d
parent152b92db7ad2c6d6c11c8eab07e90b73a90c8b76
parente5ea3f12d41d96edf4ad9374db2b1725e457acec
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