diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-05 12:11:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-05 12:11:40 -0700 |
| commit | 85f6d2dbfdc7e6c6ac955012c03ce31a8f947b94 (patch) | |
| tree | da0ead1d1f0d2badd66b6ecfd0636ab22b9ab495 /kernel/time/timekeeping.c | |
| parent | 4ed547641dd0e5db0e2e49c87b85307a9fd7bee4 (diff) | |
| parent | fac7fa162a19100298d5d91359960037dc5bfca9 (diff) | |
Merge tag 'gpio-v3.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio
Pull GPIO fixes from Linus Walleij:
"Two patches for the OMAP driver, dealing with setting up IRQs properly
on the device tree boot path"
* tag 'gpio-v3.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
gpio/omap: auto-setup a GPIO when used as an IRQ
gpio/omap: maintain GPIO and IRQ usage separately
Diffstat (limited to 'kernel/time/timekeeping.c')
0 files changed, 0 insertions, 0 deletions