aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/ni52.c
diff options
context:
space:
mode:
authorLinus Torvalds2011-06-15 22:01:36 -0700
committerLinus Torvalds2011-06-15 22:01:36 -0700
commit19a1166fa2352f9c07a5ab34a3c2aab462cff35d (patch)
tree0a99561aa026b8edc7a3621c3e32ba2314508d58 /drivers/net/ni52.c
parent13fca640bb8ab611a50e0ba120b186faa2994d6c (diff)
parent7d7975a0e1da7d6e558211b6296a96f1d6bf60ce (diff)
Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm: ARM: footbridge: fix clock event support ARM: footbridge: fix debug macros ARM: initrd: disable initrds outside of memory ARM: extend Code: line by one 16-bit quantity for Thumb instructions ARM: 6955/1: cmpxchg syscall should data abort if page not write ARM: 6954/1: zImage: fix Thumb2 breakage ARM: 6953/1: DT: don't try to access physical address zero ARM: 6949/2: mach-u300: fix compilaton warning in IO accessors Revert "ARM: 6944/1: mm: allow ASID 0 to be allocated to tasks" Revert "ARM: 6943/1: mm: use TTBR1 instead of reserved context ID" davinci: make PCM platform devices static arm: davinci: Fix fallout from generic irq chip conversion ARM: 6894/1: mmci: trigger card detect IRQs on falling and rising edges ARM: 6952/1: fix lockdep warning of "unannotated irqs-off" ARM: 6951/1: include .bss in memory layout information ARM: 6948/1: Fix .size directives for __arm{7,9}tdmi_proc_info ARM: 6947/2: mach-u300: fix compilation error in timer ARM: 6946/1: vexpress: move v2m clock init to init_early ARM: mx51/sdma: Check the chip revision in run-time arm: mxs: include asm/processor.h for cpu_relax()
Diffstat (limited to 'drivers/net/ni52.c')
0 files changed, 0 insertions, 0 deletions