Merge tag 'uapi-20121219' into for-linus

UAPI Disintegration 2012-12-19

This is the remaining SCSI part of the UAPI
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

include/scsi/Kbuild

-header-y += scsi_netlink.h
-header-y += scsi_netlink_fc.h
-header-y += scsi_bsg_fc.h
 header-y += fc/

include/uapi/scsi/Kbuild

 # UAPI Header export list
 header-y += fc/
+header-y += scsi_bsg_fc.h
+header-y += scsi_netlink.h
+header-y += scsi_netlink_fc.h