| commit | 5725aeae5ff2e39f3815bbef788ee326c9afea2c | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Mon Oct 31 23:11:46 2011 +0100 |
| committer | Arnd Bergmann <arnd@arndb.de> | Tue Nov 01 00:25:01 2011 +0100 |
| tree | 4f32f936ba18384d48ab1e537b787a8ce666263f | |
| parent | 43872fa788060eef91ae437957e0a5e39f1c56fd [diff] | |
| parent | 0cdc8b921d68817b687755b4f6ae20cd8ff1d026 [diff] |
Merge branch 'depends/rmk/memory_h' into next/fixes Fix up all conflicts between the memory.h cleanup and bug fixes. Signed-off-by: Arnd Bergmann <arnd@arndb.de>