| commit | 59f91e5dd0504dc0ebfaa0b6f3a55e6931f96266 | [log] [tgz] |
|---|---|---|
| author | Jiri Kosina <jkosina@suse.cz> | Fri Jun 29 14:45:58 2012 +0200 |
| committer | Jiri Kosina <jkosina@suse.cz> | Fri Jun 29 14:45:58 2012 +0200 |
| tree | b913718405d44a921905ac71044fbde410256865 | |
| parent | 57bdfdd80077addf518a9b90c4a66890efc4f70e [diff] | |
| parent | 89abfab133ef1f5902abafb744df72793213ac19 [diff] |
Merge branch 'master' into for-next Conflicts: include/linux/mmzone.h Synced with Linus' tree so that trivial patch can be applied on top of up-to-date code properly. Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>