tree 8d9a6946d6cf1c5aab72651a193ff860651e5e65
parent 593721833d2a3987736467144ad062a709d3a72c
parent 0b492fce3d72d982a7981905f85484a1e1ba7fde
author David S. Miller <davem@davemloft.net> 1234003964 -0800
committer David S. Miller <davem@davemloft.net> 1234003964 -0800

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-agn.c
	drivers/net/wireless/iwlwifi/iwl3945-base.c