projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
46671b0
c226feb
)
Merge branch 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6
author
Linus Torvalds
<torvalds@linux-foundation.org>
Wed, 8 Jun 2011 15:22:29 +0000
(08:22 -0700)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Wed, 8 Jun 2011 15:22:29 +0000
(08:22 -0700)
* 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6:
gpio/samsung: make Kconfig options def_bool
gpio/exynos4: Fix incorrect mapping of gpio pull-up macro to register setting
GPIO: OMAP: add locking around calls to _set_gpio_triggering
GPIO: OMAP: fix setting IRQWAKEN bits for OMAP4
GPIO: OMAP: fix section mismatch warnings
gpio: Fix gpio-exynos4 build fails in mainline
Trivial merge