first commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable
Merge remote-tracking branch 'upstream/master' into rpi-3.6.y
Compile problem fix.

In Mac OS, argument of awk must have have space between option and its value.

e.g. '-v N=1' is ok, but '-vN=1' is not.