From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 12 Jun 2011 18:03:29 +0000 (-0700)
Subject: Merge branch 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=08d63aac436b2ad35d9e864b9ebb05bc8b9bb653;p=linux-beck.git

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
---

08d63aac436b2ad35d9e864b9ebb05bc8b9bb653