git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 851fd7b 3ec1925)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Thu, 27 Nov 2008 07:48:40 +0000 (23:48 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 27 Nov 2008 07:48:40 +0000 (23:48 -0800)
Conflicts:

drivers/net/hp-plus.c
drivers/net/wireless/ath5k/base.c
drivers/net/wireless/ath9k/recv.c
net/wireless/reg.c


Trivial merge
Pandora Kernel Repository