Merge branch 'master' into for-next

This commit is contained in:
Jiri Kosina
2010-08-04 15:14:38 +02:00
1744 changed files with 34752 additions and 212871 deletions

View File

@@ -19,7 +19,7 @@
*/
#include <linux/kernel.h>
#include <linux/lmb.h>
#include <linux/memblock.h>
#include <asm/machdep.h>
#include <asm/prom.h>