]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commit
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/stable/stable...
authorChris Wright <chrisw@sous-sol.org>
Wed, 6 Jun 2007 20:52:15 +0000 (13:52 -0700)
committerChris Wright <chrisw@sous-sol.org>
Wed, 6 Jun 2007 20:52:15 +0000 (13:52 -0700)
commite9ed3a443c002870350340e84e51e92f41d7a01c
treee3a5e2d0568402c921d4d16fab726bb0fb71317c
parent47dd8f88bbe0eef758e1eb6fe31c386ebe739f90
parent3bfa2eb870bb8be4ba71680d2fd8b82b2854dc01
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/stable/stable-queue

Conflicts:

queue-2.6.20/series
queue-2.6.20/series