]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commit
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/stable/stable...
authorGreg Kroah-Hartman <gregkh@suse.de>
Wed, 15 Sep 2010 19:27:14 +0000 (12:27 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 15 Sep 2010 19:27:14 +0000 (12:27 -0700)
commita41db63b620a94d2db99c18c1c4f27cb990c7cc3
treeceaf9b624ae66504632bfc961f51d3cad59dd1ee
parente8f93558b229e49a4862219091d6a2e2f3d2f1c5
parent51e6ca5b7b5299d8fdb49c7ec7045a1702777776
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/stable/stable-queue

Conflicts:
queue-2.6.32/series
queue-2.6.35/series
queue-2.6.32/series
queue-2.6.35/series