summaryrefslogtreecommitdiff
path: root/drivers/parport
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-09-08 01:02:09 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-09-08 01:02:09 +0400
commit78f220a84f464ff1a74d1b646e9b96bdddc47050 (patch)
tree9a7b8bd85752f029d84aaef5ff8d189022ea80ff /drivers/parport
parent4848d7156943085c0d4ca0b0575474af25673699 (diff)
parentd3f6e6c666c0f68991d785177c4c62fcd1d651f2 (diff)
downloadlinux-78f220a84f464ff1a74d1b646e9b96bdddc47050.tar.xz
Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6
* 'linux-next' of git://git.infradead.org/ubi-2.6: UBI: do not oops when erroneous PEB is scheduled for scrubbing UBI: fix kconfig unmet dependency UBI: fix forward compatibility UBI: eliminate update of list_for_each_entry loop cursor
Diffstat (limited to 'drivers/parport')
0 files changed, 0 insertions, 0 deletions