Updated files
Updated files
Updated files
Merge https://github.com/aloksinha2001/Linux3188

Conflicts:
	scripts/basic/fixdep
	scripts/bmptologo
	scripts/conmakehash
	scripts/kallsyms
	scripts/kconfig/conf
	scripts/kconfig/mconf
	scripts/mod/mk_elfconfig
	scripts/mod/modpost
	scripts/pnmtologo
	usr/gen_init_cpio

	modified:   .gitignore
	new file:   Documentation/.gitignore
	new file:   Documentation/DocBook/.gitignore
	new file:   Documentation/accounting/.gitignore
	new file:   Documentation/auxdisplay/.gitignore
	new file:   Documentation/connector/.gitignore
	modified:   Documentation/fb/00-INDEX
	new file:   Documentation/fb/fbcondecor.txt
	new file:   Documentation/ia64/.gitignore
	new file:   Documentation/networking/.gitignore
	new file:   Documentation/networking/timestamping/.gitignore
	new file:   Documentation/pcmcia/.gitignore
	new file:   Documentation/spi/.gitignore
	new file:   Documentation/video4linux/.gitignore
	new file:   Documentation/vm/.gitignore
	new file:   Documentation/watchdog/src/.gitignore
	new file:   arch/.gitignore
	new file:   arch/alpha/kernel/.gitignore
	new file:   arch/arm/boot/.gitignore
	new file:   arch/arm/boot/compressed/.gitignore
	new file:   arch/arm/kernel/.gitignore
	new file:   arch/avr32/boot/images/.gitignore
	new file:   arch/avr32/kernel/.gitignore
	new file:   arch/blackfin/boot/.gitignore
	new file:   arch/blackfin/kernel/.gitignore
	new file:   arch/cris/boot/.gitignore
	new file:   arch/ia64/kernel/.gitignore
	new file:   arch/m32r/kernel/.gitignore
	new file:   arch/m68k/kernel/.gitignore
	new file:   arch/microblaze/boot/.gitignore
	new file:   arch/microblaze/kernel/.gitignore
	new file:   arch/mips/boot/.gitignore
	new file:   arch/mips/cavium-octeon/.gitignore
	new file:   arch/mips/kernel/.gitignore
	new file:   arch/mn10300/boot/.gitignore
	new file:   arch/parisc/kernel/.gitignore
	new file:   arch/powerpc/boot/.gitignore
	new file:   arch/powerpc/kernel/.gitignore
	new file:   arch/powerpc/kernel/vdso32/.gitignore
	new file:   arch/powerpc/kernel/vdso64/.gitignore
	new file:   arch/powerpc/platforms/cell/spufs/.gitignore
	new file:   arch/s390/boot/.gitignore
	new file:   arch/s390/boot/compressed/.gitignore
	new file:   arch/s390/kernel/.gitignore
	new file:   arch/s390/kernel/vdso32/.gitignore
	new file:   arch/s390/kernel/vdso64/.gitignore
	new file:   arch/sh/boot/.gitignore
	new file:   arch/sh/boot/compressed/.gitignore
	new file:   arch/sh/kernel/.gitignore
	new file:   arch/sh/kernel/vsyscall/.gitignore
	new file:   arch/sparc/boot/.gitignore
	new file:   arch/sparc/kernel/.gitignore
	new file:   arch/um/.gitignore
	new file:   arch/unicore32/.gitignore
	new file:   arch/x86/.gitignore
	new file:   arch/x86/boot/.gitignore
	new file:   arch/x86/boot/compressed/.gitignore
	new file:   arch/x86/boot/tools/.gitignore
	new file:   arch/x86/kernel/.gitignore
	new file:   arch/x86/kernel/cpu/.gitignore
	new file:   arch/x86/lib/.gitignore
	new file:   arch/x86/tools/.gitignore
	new file:   arch/x86/vdso/.gitignore
	new file:   arch/x86/vdso/vdso32/.gitignore
	modified:   drivers/Makefile
	new file:   drivers/atm/.gitignore
	new file:   drivers/eisa/.gitignore
	new file:   drivers/gpu/drm/radeon/.gitignore
	deleted:    drivers/gpu/mali/mali/Module.symvers
	deleted:    drivers/gpu/mali/ump/Module.symvers
	deleted:    drivers/gpu/mali/umplock/Module.symvers
	new file:   drivers/net/wan/.gitignore
	modified:   drivers/net/wireless/Makefile
	new file:   drivers/scsi/.gitignore
	new file:   drivers/scsi/aic7xxx/.gitignore
	new file:   drivers/staging/usbip/userspace/.gitignore
	modified:   drivers/staging/zcache/Makefile
	renamed:    drivers/staging/zcache/zcache.c -> drivers/staging/zcache/zcache_drv.c
	new file:   drivers/tty/vt/.gitignore
	modified:   drivers/video/Kconfig
	modified:   drivers/video/console/Kconfig
	modified:   drivers/video/console/Makefile
	modified:   drivers/video/console/bitblit.c
	new file:   drivers/video/console/cfbcondecor.c
	modified:   drivers/video/console/fbcon.c
	new file:   drivers/video/console/fbcondecor.c
	new file:   drivers/video/console/fbcondecor.h
	modified:   drivers/video/fbcmap.c
	modified:   drivers/video/fbmem.c
	new file:   drivers/video/logo/.gitignore
	new file:   drivers/zorro/.gitignore
	new file:   firmware/.gitignore
	new file:   firmware/cis/.gitignore
	new file:   include/linux/console_decor.h
	modified:   include/linux/console_struct.h
	modified:   include/linux/fb.h
	new file:   kernel/.gitignore
	new file:   kernel/debug/kdb/.gitignore
	modified:   kernel/sysctl.c
	new file:   lib/.gitignore
	new file:   lib/raid6/.gitignore
	deleted:    mk908.img
	new file:   net/wireless/.gitignore
	new file:   scripts/.gitignore
	new file:   scripts/basic/.gitignore
	new file:   scripts/dtc/.gitignore
	new file:   scripts/genksyms/.gitignore
	new file:   scripts/kconfig/.gitignore
	new file:   scripts/kconfig/lxdialog/.gitignore
	new file:   scripts/mod/.gitignore
	new file:   scripts/selinux/genheaders/.gitignore
	new file:   scripts/selinux/mdp/.gitignore
	new file:   security/apparmor/.gitignore
	new file:   security/selinux/.gitignore
	new file:   security/tomoyo/.gitignore
	new file:   sound/oss/.gitignore
	new file:   tools/perf/.gitignore
	new file:   usr/.gitignore