Merge ../bleed-2.6

diff --cc arch/arm/mach-sa1100/neponset.c
Simple merge

diff --cc drivers/mtd/maps/sa1100-flash.c
Simple merge

diff --cc drivers/net/wan/cosa.c
Simple merge

diff --cc drivers/scsi/osst.c
Simple merge

diff --cc drivers/scsi/sg.c
Simple merge

diff --cc drivers/scsi/st.c
Simple merge

diff --cc drivers/serial/pxa.c
Simple merge

diff --cc drivers/usb/core/hcd.c
Simple merge

diff --cc drivers/usb/gadget/dummy_hcd.c
Simple merge

diff --cc drivers/usb/gadget/omap_udc.c
Simple merge

diff --cc drivers/usb/gadget/pxa2xx_udc.c
Simple merge

diff --cc drivers/usb/host/isp116x-hcd.c
Simple merge

diff --cc drivers/usb/host/sl811-hcd.c
Simple merge

diff --cc fs/partitions/check.c
Simple merge

diff --cc include/linux/genhd.h
Simple merge

diff --cc include/linux/i2o.h
Simple merge

diff --cc lib/kobject_uevent.c
Simple merge