]> 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, 26 Apr 2006 18:40:49 +0000 (11:40 -0700)
committerChris Wright <chrisw@sous-sol.org>
Wed, 26 Apr 2006 18:40:49 +0000 (11:40 -0700)
commit479ad698ef551f4e133e968b0c2ccd338da3f8e6
tree445dfecee0808efc0a28536a867866835e948731
parent29c0d882b6908530f010a70d9d1850fe22b9b0af
parent48b9bb6be4e97890a9c69ce4c11c7309dcbab18e
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/stable/stable-queue

Conflicts:

queue-2.6.16/lsm-add-missing-hook-to-do_compat_readv_writev.patch
queue-2.6.16/lsm-add-missing-hook-to-do_compat_readv_writev.patch