Commits

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ Conflicts: include/linux/mod_devicetable.h scripts/mod/file2alias.c
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ Conflicts: include/linux/mod_devicetable.h scripts/mod/file2alias.c