tree fe3dc41cbb47ae12b7c3faf6a88b097349e50d5a
parent e35c3269edba151e1c703d87068a28ce2cd65bb0
parent d420895efb259a78dda50f95289571faa6e10e41
author David S. Miller <davem@davemloft.net> 1214641180 -0700
committer David S. Miller <davem@davemloft.net> 1214641180 -0700

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

Conflicts:

	drivers/net/wireless/iwlwifi/iwl4965-base.c