Merge branch 'master' into for-2.6.39

diff --cc drivers/acpi/osl.c
Simple merge

diff --cc drivers/md/md.c
Simple merge

diff --cc drivers/scsi/qla2xxx/qla_os.c
Simple merge

diff --cc fs/ext4/super.c
Simple merge

diff --cc fs/nfs/inode.c
Simple merge

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

diff --cc kernel/workqueue.c
Simple merge