summaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-eh.c
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2012-01-05 11:05:51 -0700
committerGrant Likely <grant.likely@secretlab.ca>2012-01-05 11:05:51 -0700
commitfda87903f4e9caf87e02d52768c2611e417b7efb (patch)
treebd2f84361699651cce5661bcfe60e3fe5ee91517 /drivers/ide/ide-eh.c
parent1a0703ede4493bd74f9c6b53f782b749e175a88e (diff)
parent2de0dbc5f6830e7659083d1929f57cb88b16a3b6 (diff)
downloadtalos-obmc-linux-fda87903f4e9caf87e02d52768c2611e417b7efb.tar.gz
talos-obmc-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/ide/ide-eh.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud