git.cascardo.info Git - cascardo/linux.git/commit

projects / cascardo / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 4785879 3d30701)

author	Jiri Kosina <jkosina@suse.cz>
	Wed, 11 Aug 2010 07:36:51 +0000 (09:36 +0200)
committer	Jiri Kosina <jkosina@suse.cz>
	Wed, 11 Aug 2010 07:36:51 +0000 (09:36 +0200)
commit	6396fc3b3ff3f6b942992b653a62df11dcef9bea
tree	db3c7cbe833b43c653adc99f70941431c5ff7c4e	tree \| snapshot
parent	4785879e4d340e24e54f6de2ccfc42728b912808	commit \| diff
parent	3d30701b58970425e1d45994d6cb82f828924fdd	commit \| diff

Merge branch 'master' into for-next

Conflicts:
fs/exofs/inode.c

13 files changed:

block/blk-core.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/f_hid.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/langwell_udc.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ehci-hcd.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/imx21-hcd.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ohci-hcd.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/oxu210hp-hcd.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/misc/ftdi-elan.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/serial/ftdi_sio.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/serial/io_ti.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/serial/iuu_phoenix.c	diff1 \|	diff2 \|	blob \| history
fs/exofs/inode.c	diff1 \|	diff2 \|	blob \| history
fs/exofs/ios.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.