summaryrefslogtreecommitdiffstats
path: root/arch/um
diff options
context:
space:
mode:
authorLinus Torvalds2009-08-09 23:58:34 +0200
committerLinus Torvalds2009-08-09 23:58:34 +0200
commitf4b9a988685da6386d7f9a72df3098bcc3270526 (patch)
tree73432363e9f42b3d0d79d523c91058bb53555722 /arch/um
parentMerge branch 'kvm-updates/2.6.31' of git://git.kernel.org/pub/scm/virt/kvm/kvm (diff)
parentUBI: compatible fallback in absense of sequence numbers (diff)
downloadkernel-qcow2-linux-f4b9a988685da6386d7f9a72df3098bcc3270526.tar.gz
kernel-qcow2-linux-f4b9a988685da6386d7f9a72df3098bcc3270526.tar.xz
kernel-qcow2-linux-f4b9a988685da6386d7f9a72df3098bcc3270526.zip
Merge branch 'for-linus' of git://git.infradead.org/ubi-2.6
* 'for-linus' of git://git.infradead.org/ubi-2.6: UBI: compatible fallback in absense of sequence numbers UBI: fix double free on error path
Diffstat (limited to 'arch/um')
0 files changed, 0 insertions, 0 deletions