Merge branch 'master' into for-linus

This commit is contained in:
Russell King
2009-09-22 20:54:53 +01:00
2706 changed files with 353967 additions and 233966 deletions

View File

@@ -22,6 +22,7 @@
#include <linux/list.h>
#include <linux/io.h>
#include <linux/sysdev.h>
#include <linux/device.h>
#include <linux/amba/bus.h>
#include <asm/mach/irq.h>