Fix conflict in last commit
Adjust Makefiles
usb: gadget: mass_storage: added sysfs entry for cdrom to LUNs

This patch adds a "cdrom" sysfs entry for each mass_storage LUN, just
like "ro" sysfs entry. This allows switching between USB and CD-ROM
emulation without reinserting the module or recompiling the kernel.

Change-Id: Idf83c74815b1ad370428ab9d3e5503d5f7bcd3b6

Signed-off-by: flar2 <asegaert@gmail.com>
sysfs entry for fsync

Signed-off-by: flar2 <asegaert@gmail.com>

Conflicts:
	fs/sync.c
Fix conflict
USB fastcharge

Signed-off-by: flar2 <asegaert@gmail.com>
Add button light notifcation based on work by @tbalden

Signed-off-by: flar2 <asegaert@gmail.com>
Lower resolution for MHL output so refresh rate can be increased to 60Hz

Signed-off-by: flar2 <asegaert@gmail.com>
overclocking and voltage control

Signed-off-by: flar2 <asegaert@gmail.com>
Downgrade CIFS
disable CRC check

Signed-off-by: flar2 <asegaert@gmail.com>

Conflicts:
	drivers/mmc/core/core.c