git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dfef948 66b00a7)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Thu, 19 Nov 2009 06:19:03 +0000 (22:19 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 19 Nov 2009 06:19:03 +0000 (22:19 -0800)
Conflicts:
drivers/net/sfc/sfe4001.c
drivers/net/wireless/libertas/cmd.c
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/rtl8187se/Kconfig
drivers/staging/rtl8192e/Kconfig


Trivial merge
Pandora Kernel Repository