diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2012-01-05 19:05:51 +0100 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2012-01-05 19:05:51 +0100 |
| commit | fda87903f4e9caf87e02d52768c2611e417b7efb (patch) | |
| tree | bd2f84361699651cce5661bcfe60e3fe5ee91517 /drivers/gpio/gpio-ucb1400.c | |
| parent | GPIO: add bindings for managed devices (diff) | |
| parent | gpio: pl061: remove combined interrupt (diff) | |
| download | linux-fda87903f4e9caf87e02d52768c2611e417b7efb.tar.xz linux-fda87903f4e9caf87e02d52768c2611e417b7efb.zip | |
Merge branch 'gpio-for-grant' of git://sources.calxeda.com/kernel/linux into gpio/next
Conflicts:
drivers/gpio/gpio-pl061.c
Diffstat (limited to 'drivers/gpio/gpio-ucb1400.c')
0 files changed, 0 insertions, 0 deletions