diff options
| author | Linus Torvalds | 2011-06-08 08:22:29 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2011-06-08 08:22:29 -0700 |
| commit | 5b28f6a25ee202046e2d57bd431671bc23cf3dd1 (patch) | |
| tree | 5e06129755ac05dcbd221d553ddba78e53d36ce2 /fs/btrfs/sysfs.c | |
| parent | 46671b035504eb345124b4b275b37726a48bdbaa (diff) | |
| parent | c226feb013ce81a18512fb4827bf7c2352d8b470 (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/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
Diffstat (limited to 'fs/btrfs/sysfs.c')
0 files changed, 0 insertions, 0 deletions