]> 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>
Fri, 24 Mar 2006 07:46:53 +0000 (23:46 -0800)
committerChris Wright <chrisw@sous-sol.org>
Fri, 24 Mar 2006 07:46:53 +0000 (23:46 -0800)
commit641b5550c5d0dbddc8e210054a0f34892dad061e
treef3f5c145d9fb6e8a929a54a0903c5dd782051a92
parent0d313c7eef6da1fcb689240719d2c98e7a74430c
parente3453ee903ec35dbef4935f4015ea211f08598b9
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/stable/stable-queue

Conflicts:

queue-2.6.16/series
queue-2.6.16/series