Commits
Alexey Dobriyan authored 58e1931440dM
Merge 2.6.22.6 git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.22.y Conflicts: Makefile block/cfq-iosched.c include/linux/netdevice.h ipc/shm.c
Merge 2.6.22.6 git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.22.y Conflicts: Makefile block/cfq-iosched.c include/linux/netdevice.h ipc/shm.c