Merge branch 'for-patrick' of git://git.kernel.org/pub/scm/linux/kernel/git/horms...
Patrick McHardy [Thu, 21 Oct 2010 14:25:51 +0000 (16:25 +0200)]

Trivial merge