]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorAvi Kivity <avi@qumranet.com>
Mon, 5 May 2008 03:45:11 +0000 (06:45 +0300)
committerAvi Kivity <avi@qumranet.com>
Mon, 5 May 2008 03:45:11 +0000 (06:45 +0300)

Trivial merge