Merge branch 'master'

Documentation/arm/00-INDEX

Documentation/dvb/README.dvb-usb

Documentation/dvb/README.flexcop

Documentation/dvb/avermedia.txt

Documentation/dvb/cards.txt

Documentation/dvb/contributors.txt

Documentation/dvb/readme.txt

Documentation/filesystems/ext3.txt

Makefile

arch/arm/kernel/ptrace.c

arch/i386/kernel/kprobes.c

arch/i386/kernel/traps.c

arch/ia64/Kconfig

arch/ia64/kernel/kprobes.c

arch/mips/mm/init.c

arch/powerpc/Kconfig

arch/powerpc/kernel/kprobes.c

arch/powerpc/kernel/setup_64.c

arch/powerpc/mm/hash_utils_64.c

arch/powerpc/mm/hugetlbpage.c