From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 31 Oct 2012 05:48:32 +0000 (+1100)
Subject: Merge branch 'akpm-current/current'
X-Git-Tag: next-20121031~2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=79af55f4085de2c39f8099b89ef1eb25344b67db;p=karo-tx-linux.git

Merge branch 'akpm-current/current'

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

79af55f4085de2c39f8099b89ef1eb25344b67db