bbs.cooldavid.org Git - net-next-2.6.git/commit

]> bbs.cooldavid.org Git - net-next-2.6.git/commit

git://bbs.cooldavid.org / net-next-2.6.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 6451d77 8939b35)

author	Kevin Hilman <khilman@deeprootsystems.com>
	Thu, 21 Oct 2010 18:21:55 +0000 (11:21 -0700)
committer	Kevin Hilman <khilman@deeprootsystems.com>
	Thu, 21 Oct 2010 18:21:55 +0000 (11:21 -0700)
commit	7940a34b2e1e0485211a17d8c3ab4da1ea3e1330
tree	fe08ba701cbf23ae44a16d3b7afa521fce943a8a	tree \| snapshot (tar.bz2 tar.gz zip)
parent	6451d7783ba5ff24eb1a544eaa6665b890f30466	commit \| diff
parent	8939b3504dc35224cb9c88e5af925b22ea9eee71	commit \| diff

Merge branch 'davinci-next' into davinci-for-linus

Conflicts:
arch/arm/mach-davinci/board-da830-evm.c
arch/arm/mach-davinci/board-da850-evm.c

15 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/board-da830-evm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/board-da850-evm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/board-dm365-evm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/board-dm644x-evm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/board-dm646x-evm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/board-neuros-osd2.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/board-sffsdr.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/board-tnetv107x-evm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/dm365.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/dm644x.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/dm646x.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-am3517evm.c	diff1 \|	diff2 \|	blob \| history
drivers/input/keyboard/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/Kconfig	diff1 \|	diff2 \|	blob \| history

Clone of davem's net-next-2.6 tree