]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
projects / mirror_ubuntu-disco-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 35020f1 7a1fc53)
Merge branch 'for-2.6.26' into for-next
authorNeil Brown <neilb@suse.de>
Thu, 10 Jul 2008 06:51:26 +0000 (16:51 +1000)
committerNeil Brown <neilb@suse.de>
Thu, 10 Jul 2008 06:51:26 +0000 (16:51 +1000)
Conflicts:

drivers/md/raid5.c


Trivial merge
Ubuntu Disco kernel mirror for Proxmox VE and PMG