2014.01.04 스터디
Merge branch 'study' of https://github.com/iamroot10a/linux into study

Conflicts:
	include/asm-generic/bug.h
	mm/bootmem.c
	mm/page_alloc.c