first commit from Lexar card
first commit from Lexar card
first commit from Lexar card
4th try for Lexar
first attempt at merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	dev/.blkid.tab
	dev/.blkid.tab.old
	home/linaro/.dbus/session-bus/e4084059916f6c6f2627d7c100000008-0
	home/linaro/.xsession-errors
	home/linaro/.xsession-errors.old
	root/.bash_history
	root/.dbus/session-bus/e4084059916f6c6f2627d7c100000008-10
	root/.emacs.d/auto-save-list/.saves-1115-vader-rover~
	root/.emacs.d/auto-save-list/.saves-1115-vader-rover~~HEAD
	root/.emacs.d/auto-save-list/.saves-1115-vader-rover~~first commit from Lexar card
	root/.emacs.d/auto-save-list/.saves-1279-vader-rover~
	run/ConsoleKit/database
	run/avahi-daemon/pid
	run/console-kit-daemon.pid
	run/crond.pid
	run/dbus/pid
	run/dhclient.wlan0.pid
	run/lightdm.pid
	run/ntpd.pid
	run/rsyslogd.pid
	run/sshd.pid
	run/udev/data/+sound:card0
	run/udev/data/b179:0
	run/udev/data/b179:1
	run/udev/data/b179:2
	run/udev/data/b1:0
	run/udev/data/b1:1
	run/udev/data/b1:10
	run/udev/data/b1:11
	run/udev/data/b1:12
	run/udev/data/b1:13
	run/udev/data/b1:14
	run/udev/data/b1:15
	run/udev/data/b1:2
	run/udev/data/b1:3
	run/udev/data/b1:4
	run/udev/data/b1:5
	run/udev/data/b1:6
	run/udev/data/b1:7
	run/udev/data/b1:8
	run/udev/data/b1:9
	run/udev/data/b31:0
	run/udev/data/b31:1
	run/udev/data/b31:2
	run/udev/data/b31:3
	run/udev/data/b31:4
	run/udev/data/b7:0
	run/udev/data/b7:1
	run/udev/data/b7:2
	run/udev/data/b7:3
	run/udev/data/b7:4
	run/udev/data/b7:5
	run/udev/data/b7:6
	run/udev/data/b7:7
	run/udev/data/c116:0
	run/udev/data/c116:16
	run/udev/data/c116:24
	run/udev/data/c116:33
	run/udev/data/c14:0
	run/udev/data/c14:3
	run/udev/data/c14:4
	run/udev/data/c188:0
	run/udev/data/c188:1
	run/udev/data/c189:0
	run/udev/data/c189:1
	run/udev/data/c189:2
	run/udev/data/c189:3
	run/udev/data/c189:4
	run/udev/data/c189:5
	run/udev/data/c189:6
	run/udev/data/c29:0
	run/udev/data/c29:1
	run/udev/data/c29:2
	run/udev/data/c81:0
	run/udev/data/c81:1
	run/udev/data/c81:10
	run/udev/data/c81:11
	run/udev/data/c81:12
	run/udev/data/c81:13
	run/udev/data/c81:14
	run/udev/data/c81:2
	run/udev/data/c81:3
	run/udev/data/c81:4
	run/udev/data/c81:5
	run/udev/data/c81:6
	run/udev/data/c81:7
	run/udev/data/c81:8
	run/udev/data/c81:9
	run/udev/data/n2
	run/udev/links/disk\x2fby-id\x2fmmc-SU64G_0x104e8e06-part1/b179:1
	run/udev/links/disk\x2fby-id\x2fmmc-SU64G_0x104e8e90-part1/b179:1
	run/udev/links/disk\x2fby-id\x2fmmc-SU64G_0x104e8e90-part2/b179:2
	run/udev/links/disk\x2fby-id\x2fmmc-SU64G_0x104e8e90/b179:0
	run/udev/queue.bin
	run/upstart-socket-bridge.pid
	run/upstart-udev-bridge.pid
	run/utmp
	tmp/.X0-lock
	var/lib/dhcp/dhclient.wlan0.leases
	var/lib/plymouth/boot-duration
	var/log/ConsoleKit/history
	var/log/Xorg.0.log
	var/log/Xorg.0.log.old
	var/log/auth.log
	var/log/boot.log
	var/log/dmesg
	var/log/dmesg.0
	var/log/kern.log
	var/log/lastlog
	var/log/lightdm/lightdm.log
	var/log/lightdm/x-0.log
	var/log/syslog
	var/log/udev
	var/log/upstart/console-setup.log
	var/log/upstart/container-detect.log
	var/log/upstart/dbus.log
	var/log/upstart/lightdm.log
	var/log/upstart/network-interface-wlan0.log
	var/log/upstart/procps-static-network-up.log
	var/log/upstart/procps-virtual-filesystems.log
	var/log/upstart/ureadahead.log
	var/log/wtmp