Merge branch 'linux-2.6' into for-2.6.22
authorPaul Mackerras <paulus@samba.org>
Mon, 30 Apr 2007 02:38:01 +0000 (12:38 +1000)
committerPaul Mackerras <paulus@samba.org>
Mon, 30 Apr 2007 02:38:01 +0000 (12:38 +1000)
commit49e1900d4cc2e7bcecb681fe60f0990bec2dcce8
tree253801ebf57e0a23856a2c7be129c2c178f62fdf
parent34f6d749c0a328817d5e36274e53121c1db734dc
parentb9099ff63c75216d6ca10bce5a1abcd9293c27e6
Merge branch 'linux-2.6' into for-2.6.22
arch/powerpc/kernel/of_platform.c
arch/powerpc/kernel/ppc_ksyms.c
drivers/infiniband/hw/ehca/ehca_main.c
drivers/macintosh/smu.c
drivers/media/video/planb.c
drivers/net/Kconfig
drivers/video/Kconfig
sound/aoa/soundbus/core.c