From: Stephen Rothwell Date: Mon, 2 Apr 2012 02:41:02 +0000 (+1000) Subject: Merge remote-tracking branch 'tip/auto-latest' X-Git-Tag: next-20120402~16 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=fb20cfed1485bff8594e0b76d8b7c8a02b154387;p=karo-tx-linux.git Merge remote-tracking branch 'tip/auto-latest' Conflicts: Documentation/feature-removal-schedule.txt --- fb20cfed1485bff8594e0b76d8b7c8a02b154387 diff --cc Documentation/feature-removal-schedule.txt index 5298e126cea3,03ca210406ed..1fafa401a1c5 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt @@@ -542,9 -534,8 +534,17 @@@ Who: Kees Cook