git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3b8626b 5fdd4ba)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Sun, 29 Nov 2009 08:57:15 +0000 (00:57 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sun, 29 Nov 2009 08:57:15 +0000 (00:57 -0800)
Conflicts:
drivers/ieee802154/fakehard.c
drivers/net/e1000e/ich8lan.c
drivers/net/e1000e/phy.c
drivers/net/netxen/netxen_nic_init.c
drivers/net/wireless/ath/ath9k/main.c


Trivial merge
Pandora Kernel Repository