Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux... v2.6.25-zen0
commit73ccfebe09b03c9a845172fdefc1919fdc7e262c
authorMiguel Botón <waninkoko@gmail.com>
Thu, 17 Apr 2008 16:52:02 +0000 (17 18:52 +0200)
committerMiguel Botón <waninkoko@gmail.com>
Thu, 17 Apr 2008 16:52:02 +0000 (17 18:52 +0200)
treebb66e4d99806f65f93792a499f3df2ba8fe9585e
parentd301463ac69839f5927b7e649004ddfa058a8478
parent4b119e21d0c66c22e8ca03df05d9de623d0eb50f
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6 into master-devel
MAINTAINERS
Makefile
arch/avr32/Kconfig
drivers/net/netconsole.c
include/asm-mips/mach-pb1x00/pb1200.h
include/linux/iocontext.h