git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f557285 159d833)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Mon, 14 Apr 2008 09:30:23 +0000 (02:30 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 14 Apr 2008 09:30:23 +0000 (02:30 -0700)
Conflicts:

drivers/net/ehea/ehea_main.c
drivers/net/wireless/iwlwifi/Kconfig
drivers/net/wireless/rt2x00/rt61pci.c
net/ipv4/inet_timewait_sock.c
net/ipv6/raw.c
net/mac80211/ieee80211_sta.c


Trivial merge
Pandora Kernel Repository