linux-2.6 files added
Merge branch 'master' of github.com:Takechiyocn/kernel

Conflicts:
	linux-2.6