]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 256cea8 b69d398)
Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Fri, 25 Apr 2008 18:49:52 +0000 (11:49 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 25 Apr 2008 18:49:52 +0000 (11:49 -0700)
commit4bb9f8b58ed7d14d276750d1792cef9b3aa1e9ec
treeb60bcece32f340fa998a9d2e11e4925c51f506c5tree | snapshot
parent256cea85955a2cdc877ed53c7f61d07f371ba1d3commit | diff
parentb69d3987f4360a5e7e9e55465b3cdd0cc204b79ecommit | diff
Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

sound/soc/Kconfig
sound/soc/Makefile
MAINTAINERS diff1 | diff2 | blob | history
arch/arm/mm/Kconfig diff1 | diff2 | blob | history
drivers/media/video/Kconfig diff1 | diff2 | blob | history
drivers/media/video/Makefile diff1 | diff2 | blob | history
include/linux/i2c-id.h diff1 | diff2 | blob | history
sound/soc/Kconfig diff1 | diff2 | blob | history
sound/soc/Makefile diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.