git.osdn.net Git - uclinux-h8/linux.git/commit

author	Yoshinori Sato <ysato@users.sourceforge.jp>
	Mon, 8 Jul 2013 07:02:41 +0000 (16:02 +0900)
committer	Yoshinori Sato <ysato@users.sourceforge.jp>
	Mon, 8 Jul 2013 07:02:41 +0000 (16:02 +0900)
commit	72f8dcc316e0a5caecc6d1fefa347568151f5fd3
tree	7cfe71cc5fe3f778467e98adfea0d1392c7c435d	tree \| snapshot
parent	26a85fc2fdb6a8eff7df101a1e9a345836a90e6f	commit \| diff
parent	c16fa4f2ad19908a47c63d8fa436a1178438c7e7	commit \| diff

Merge tag 'v3.3' into h8300

Linux 3.3

Conflicts:
arch/h8300/Kconfig
arch/h8300/include/asm/socket.h
arch/h8300/include/asm/types.h

About OSDN

Find Software

Develop Software

Help