git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a4fe91e 93af7ac)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Thu, 30 Apr 2009 03:30:35 +0000 (20:30 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 30 Apr 2009 03:30:35 +0000 (20:30 -0700)
Conflicts:
Documentation/isdn/00-INDEX
drivers/net/wireless/iwlwifi/iwl-scan.c
drivers/net/wireless/rndis_wlan.c
net/mac80211/main.c


Trivial merge
Pandora Kernel Repository