Linux 3.1.7
Varun Wadekar [Thu, 5 Jan 2012 04:35:34 +0000 (09:35 +0530)]
Change-Id: I99507d7cfdcee064f808856dc2ce99d806fd864f

1  2 
arch/arm/kernel/setup.c
drivers/usb/class/cdc-acm.c
fs/ext4/super.c
fs/fuse/dev.c
mm/page_alloc.c

Simple merge
Simple merge
diff --cc fs/ext4/super.c
Simple merge
diff --cc fs/fuse/dev.c
Simple merge
diff --cc mm/page_alloc.c
Simple merge