tree 29ccde2430d7dd34420761b7fde4a8c8976fe76c
parent 5914811acf36c3ff091f860a6964808f668f27d0
parent 2e242fa994428bd1a40b6a7e97430413246d0a16
author Linus Torvalds <torvalds@g5.osdl.org> 1140545492 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> 1140545492 -0800

Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev