]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commit
Merge branch 'master' of gregkh@master.kernel.org:/pub/scm/linux/kernel/git/stable...
authorGreg Kroah-Hartman <gregkh@suse.de>
Mon, 14 Jan 2008 21:35:06 +0000 (13:35 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 14 Jan 2008 21:35:06 +0000 (13:35 -0800)
commit46a8a7e48dfab347dcf7c97e38b0ec8a2bc0e058
treefb25bb20ec08e182a6aa8787e1c899e99a03927f
parent385ec52e0ae139a8644cec2fdf91f71565754100
parentad79d701217e53f00c7fc58aa01217df25db5096
Merge branch 'master' of gregkh@master.kernel.org:/pub/scm/linux/kernel/git/stable/stable-queue

Conflicts:

queue-2.6.23/series
queue-2.6.23/series