tree 1becb5e8aea7a9c9a7d78f987bd73b0a5d8ee434
parent f8bf5681cf15f77692c8ad8cb95d059ff7c622c9
parent f19872575ff7819a3723154657a497d9bca66b33
author David S. Miller <davem@davemloft.net> 1291842938 -0800
committer David S. Miller <davem@davemloft.net> 1291844858 -0800

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

Conflicts:
	drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
	net/llc/af_llc.c