From: Stephen Rothwell Date: Fri, 19 Aug 2011 01:51:34 +0000 (+1000) Subject: Merge remote-tracking branch 'tip/auto-latest' X-Git-Tag: next-20110819~14 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=db650508f578c94cb757ad14b4b7dbb30b69d401;p=karo-tx-linux.git Merge remote-tracking branch 'tip/auto-latest' Conflicts: arch/x86/mm/fault.c --- db650508f578c94cb757ad14b4b7dbb30b69d401