Merge branch 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6

Browse source

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

...

This commit is contained in:

Linus Torvalds 2011-06-12 11:03:29 -07:00

parent 152b92db7a e5ea3f12d4

commit 08d63aac43

4 changed files with 34 additions and 11 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

include/linux/basic_mmio_gpio.h

View file