git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

projects / kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 56e3bd8 ca93132)

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	7a2c4ecfa2985d68b2ef8411c144a9f72da1b2ee
tree	db3c7cbe833b43c653adc99f70941431c5ff7c4e	tree \| snapshot
parent	56e3bd8507dd9e6a85b4c6b5c730ab6637a2125a	commit \| diff
parent	ca93132de324124cf7c0b07b407dd6cff30812ad	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

Linux Kernel Source Tree.