Merge remote-tracking branch 'origin/master' into next-3.14

author Patrick McHardy <kaber@trash.net>

Tue, 14 Jan 2014 12:38:12 +0000 (12:38 +0000)

committer Patrick McHardy <kaber@trash.net>

Tue, 14 Jan 2014 12:38:12 +0000 (12:38 +0000)
author Patrick McHardy <kaber@trash.net>
Tue, 14 Jan 2014 12:38:12 +0000 (12:38 +0000)
committer Patrick McHardy <kaber@trash.net>
Tue, 14 Jan 2014 12:38:12 +0000 (12:38 +0000)
diff --cc src/parser.y
Simple merge
diff --cc src/scanner.l
Simple merge
author	Patrick McHardy <kaber@trash.net>
	Tue, 14 Jan 2014 12:38:12 +0000 (12:38 +0000)
committer	Patrick McHardy <kaber@trash.net>
	Tue, 14 Jan 2014 12:38:12 +0000 (12:38 +0000)
		1	2
src/parser.y	patch \|	diff1 \|	diff2 \|	blob \| history
src/scanner.l	patch \|	diff1 \|	diff2 \|	blob \| history