From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 1 Nov 2012 04:22:57 +0000 (+1100)
Subject: Merge branch 'akpm-current/current'
X-Git-Tag: next-20121101~2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=85773c5d16043bf3c74c012bcda426b7e97c1fa4;p=karo-tx-linux.git

Merge branch 'akpm-current/current'

Conflicts:
	tools/testing/selftests/epoll/test_epoll.c
---

85773c5d16043bf3c74c012bcda426b7e97c1fa4