summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-08-21 18:13:19 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-08-21 18:13:19 -0700
commit3210d190dcb717c328d74f8c3f69ec717d665b40 (patch)
tree4fbdbc85beea494165dc4bc8866f77051a730762 /mm
parent6719db6a23d4b7f1e5052eedae394135e3aef9c1 (diff)
parentaaff12039ffd812d0c8bbff50b87b6f1f09bec3e (diff)
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: firewire: core: handle ack_busy when fetching the Config ROM
Diffstat (limited to 'mm')
0 files changed, 0 insertions, 0 deletions