Merge branch 'master' of https://github.com/sharpe351/FUHU_INC_nabi2_xd-kernel

Conflicts:
	scripts/basic/.fixdep.cmd
	scripts/basic/fixdep
	scripts/kconfig/.conf.cmd
	scripts/kconfig/.conf.o.cmd
	scripts/kconfig/.mconf.o.cmd
	scripts/kconfig/.zconf.tab.o.cmd
	scripts/kconfig/conf
	scripts/kconfig/conf.o
	scripts/kconfig/lxdialog/.checklist.o.cmd
	scripts/kconfig/lxdialog/.inputbox.o.cmd
	scripts/kconfig/lxdialog/.menubox.o.cmd
	scripts/kconfig/lxdialog/.textbox.o.cmd
	scripts/kconfig/lxdialog/.util.o.cmd
	scripts/kconfig/lxdialog/.yesno.o.cmd
	scripts/kconfig/lxdialog/checklist.o
	scripts/kconfig/lxdialog/inputbox.o
	scripts/kconfig/lxdialog/menubox.o
	scripts/kconfig/lxdialog/textbox.o
	scripts/kconfig/lxdialog/util.o
	scripts/kconfig/lxdialog/yesno.o
	scripts/kconfig/mconf.o
	scripts/kconfig/zconf.hash.c
	scripts/kconfig/zconf.lex.c
	scripts/kconfig/zconf.tab.c
	scripts/kconfig/zconf.tab.o
slight changes to defconfig to see if tablet will boot. Realistically, changing back to orginal defconfig.