summaryrefslogtreecommitdiff
path: root/drivers/ide
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-11-07 20:52:19 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-11-07 20:52:19 +0400
commitcf5e15fbd72c13977720aa15b7b7e00e1d8fd8f2 (patch)
tree66ecb6f516d33915171682cc602af978c0ae014f /drivers/ide
parent31555213f03bca37d2c02e10946296052f4ecfcd (diff)
parent7606f85a701ed8feeac065e133ff9a51c267aa0d (diff)
downloadlinux-cf5e15fbd72c13977720aa15b7b7e00e1d8fd8f2.tar.xz
Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6
* 'linux-next' of git://git.infradead.org/ubifs-2.6: UBIFS: fix the dark space calculation UBIFS: introduce a helper to dump scanning info
Diffstat (limited to 'drivers/ide')
0 files changed, 0 insertions, 0 deletions