Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:
	drivers/mtd/mtdcore.c

Merged in order that I can apply the Nomadik nand/onenand support patches.

1 files changed, 5 insertions, 0 deletions

diff --git a/include/linux/amba/bus.h b/include/linux/amba/bus.h
index 9b93cafa82a0..ab94335b4bb9 100644
--- a/include/linux/amba/bus.h
+++ b/include/linux/amba/bus.h
@@ -36,6 +36,11 @@ struct amba_driver {
         struct amba_id          *id_table;
 };
 
+enum amba_vendor {
+        AMBA_VENDOR_ARM = 0x41,
+        AMBA_VENDOR_ST = 0x80,
+};
+
 #define amba_get_drvdata(d)     dev_get_drvdata(&d->dev)
 #define amba_set_drvdata(d,p)   dev_set_drvdata(&d->dev, p)