修改：      linux-3.2/a.pdf
	修改：      linux-3.2/source/net/sctp/sm_sideeffect.c
Merge branch 'master' of https://github.com/nydw/readnote

Conflicts:
	linux-3.2/source/net/sctp/sm_sideeffect.c