summaryrefslogtreecommitdiff
path: root/drivers/ide/ide-pm.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2013-09-07 07:23:44 +0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2013-09-07 07:23:44 +0400
commit07176b988ebb20f46a317a60ee1d983fe1630203 (patch)
treee54affb1f823742078c68d9506e6035016bc2ea4 /drivers/ide/ide-pm.c
parentfa46c7984092f3dbdbb3bcd7338d81a1168d9d2b (diff)
parent52764fed5049655926bcecaefd52f0a415ceb105 (diff)
downloadlinux-07176b988ebb20f46a317a60ee1d983fe1630203.tar.xz
Merge branch 'next' into for-linus
Merge first round of changes for 3.12 merge window.
Diffstat (limited to 'drivers/ide/ide-pm.c')
0 files changed, 0 insertions, 0 deletions