Merge by hand (whitespace conflicts in libata.h)

Documentation/connector/cn_test.c

Documentation/dvb/bt8xx.txt

Documentation/dvb/cards.txt

Documentation/dvb/contributors.txt

Documentation/dvb/get_dvb_firmware

Documentation/fb/fbcon.txt

Documentation/feature-removal-schedule.txt

Documentation/filesystems/ext2.txt

Documentation/i2c/busses/i2c-viapro

Documentation/i2c/writing-clients

Documentation/md.txt

Documentation/networking/README.ipw2100

Documentation/networking/README.ipw2200

Documentation/s390/Debugging390.txt

Documentation/sched-arch.txt

Documentation/video4linux/API.html

Documentation/video4linux/CARDLIST.bttv

Documentation/video4linux/CARDLIST.cx88

Documentation/video4linux/CARDLIST.em28xx

Documentation/video4linux/CARDLIST.saa7134