From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 30 Oct 2012 04:13:53 +0000 (+1100)
Subject: Merge branch 'akpm-current/current'
X-Git-Tag: next-20121030~2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9b09bd031cc4472e85ac7d87c2aff4a6aae7d111;p=karo-tx-linux.git

Merge branch 'akpm-current/current'

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

9b09bd031cc4472e85ac7d87c2aff4a6aae7d111