summaryrefslogtreecommitdiff
path: root/arch/arm/plat-pxa
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-03-04 08:27:42 +0300
committerDavid S. Miller <davem@davemloft.net>2011-03-04 08:27:42 +0300
commit0a0e9ae1bd788bc19adc4d4ae08c98b233697402 (patch)
tree13825eeb5bbeae27d66e95f12168eff4b60701ab /arch/arm/plat-pxa
parent01a16b21d6adf992aa863186c3c4e561a57c1714 (diff)
parentb65a0e0c84cf489bfa00d6aa6c48abc5a237100f (diff)
downloadlinux-0a0e9ae1bd788bc19adc4d4ae08c98b233697402.tar.xz
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/bnx2x/bnx2x.h
Diffstat (limited to 'arch/arm/plat-pxa')
0 files changed, 0 insertions, 0 deletions