Linus Torvalds 2ed0e21b30 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 ... * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1244 commits) pkt_sched: Rename PSCHED_US2NS and PSCHED_NS2US ipv4: Fix fib_trie rebalancing Bluetooth: Fix issue with uninitialized nsh.type in DTL-1 driver Bluetooth: Fix Kconfig issue with RFKILL integration PIM-SM: namespace changes ipv4: update ARPD help text net: use a deferred timer in rt_check_expire ieee802154: fix kconfig bool/tristate muckup bonding: initialization rework bonding: use is_zero_ether_addr bonding: network device names are case sensative bonding: elminate bad refcount code bonding: fix style issues bonding: fix destructor bonding: remove bonding read/write semaphore bonding: initialize before registration bonding: bond_create always called with default parameters x_tables: Convert printk to pr_err netfilter: conntrack: optional reliable conntrack event delivery list_nulls: add hlist_nulls_add_head and hlist_nulls_del ...		2009-06-15 09:40:05 -07:00
..
iseries	powerpc/iseries: Fix pci breakage due to bad dma_data initialization	2009-05-15 16:43:41 +10:00
8xx_immap.h
8253pit.h
abs_addr.h
agp.h
asm-compat.h
atomic.h	asm-generic: rename atomic.h to atomic-long.h	2009-06-11 21:02:17 +02:00
auxvec.h
backlight.h
bitops.h
bitsperlong.h	asm-generic: introduce asm/bitsperlong.h	2009-06-11 21:02:14 +02:00
bootx.h
btext.h
bug.h
bugs.h
byteorder.h
cache.h
cacheflush.h
cell-pmu.h
cell-regs.h
checksum.h
clk_interface.h
code-patching.h
compat.h
cpm.h
cpm1.h
cpm2.h	powerpc/cpm: Remove some cruft code and defines	2009-05-19 00:47:19 -05:00
cputable.h
cputhreads.h
cputime.h
current.h
dbdma.h
dbell.h
dcr-generic.h
dcr-mmio.h
dcr-native.h
dcr-regs.h
dcr.h
delay.h
device.h
disassemble.h
div64.h
dma-mapping.h	powerpc: Add support for swiotlb on 32-bit	2009-06-09 16:49:18 +10:00
dma.h
edac.h
eeh.h
eeh_event.h
elf.h	powerpc: Fix up elf_read_implies_exec() usage	2009-05-21 15:44:21 +10:00
emergency-restart.h
emulated_ops.h	powerpc: Keep track of emulated instructions	2009-05-21 15:44:26 +10:00
errno.h
exception.h
fb.h
fcntl.h
feature-fixups.h	powerpc: Enable MMU feature sections for inline asm	2009-05-21 15:44:21 +10:00
firmware.h
fixmap.h	powerpc: Minor cleanups of kernel virt address space definitions	2009-05-27 16:32:50 +10:00
floppy.h
fs_pd.h
fsl_gtm.h
fsl_lbc.h
ftrace.h
futex.h	powerpc: Fix data-corrupting bug in __futex_atomic_op	2009-04-15 15:23:53 +10:00
gpio.h
grackle.h
hardirq.h
heathrow.h
highmem.h	mm: use debug_kmap_atomic	2009-04-01 08:59:14 -07:00
hugetlb.h
hvcall.h
hvconsole.h
hvcserver.h
hw_irq.h	perfcounters: remove powerpc definitions of perf_counter_do_pending	2009-06-11 20:03:13 -07:00
hydra.h
i8259.h
ibmebus.h
ide.h
immap_86xx.h
immap_cpm2.h
immap_qe.h
io-defs.h
io.h
ioctl.h
ioctls.h
iommu.h
ipcbuf.h
ipic.h
irq.h
irq_regs.h
irqflags.h
Kbuild
kdebug.h
kdump.h
kexec.h
keylargo.h
kgdb.h
kmap_types.h
kprobes.h
kvm.h
kvm_44x.h
kvm_asm.h
kvm_e500.h
kvm_host.h
kvm_para.h
kvm_ppc.h
libata-portmap.h
linkage.h
lmb.h
local.h
lppaca.h	powerpc: Shield code specific to 64-bit server processors	2009-06-09 16:47:38 +10:00
lv1call.h
machdep.h	powerpc/irq: Move get_irq() comment into header	2009-05-21 15:43:59 +10:00
macio.h
mc146818rtc.h
mediabay.h
mman.h	asm-generic: rename termios.h, signal.h and mman.h	2009-06-11 21:01:52 +02:00
mmu-8xx.h
mmu-40x.h
mmu-44x.h
mmu-book3e.h
mmu-hash32.h
mmu-hash64.h
mmu.h	powerpc: Shield code specific to 64-bit server processors	2009-06-09 16:47:38 +10:00
mmu_context.h
mmzone.h
module.h
mpc6xx.h
mpc8xx.h
mpc52xx.h
mpc52xx_psc.h	ASoC: Add a few more mpc5200 PSC defines	2009-05-24 19:31:04 +01:00
mpc512x.h
mpc8260.h
mpic.h	powerpc: Add support for CoreInt delivery of interrupts on MPIC	2009-04-06 09:09:14 -05:00
msgbuf.h
msi_bitmap.h
mutex.h
nvram.h
of_device.h
of_platform.h	of: make of_(un)register_platform_driver common code	2009-05-02 15:36:10 -07:00
ohare.h
oprofile_impl.h
paca.h	Merge commit 'origin/master' into next	2009-06-12 16:53:38 +10:00
page.h	powerpc/pseries: CMO unused page hinting	2009-05-21 15:43:58 +10:00
page_32.h	asm-generic: rename page.h and uaccess.h	2009-06-11 21:02:17 +02:00
page_64.h	asm-generic: rename page.h and uaccess.h	2009-06-11 21:02:17 +02:00
param.h
parport.h	parport_pc: Fix build failure drivers/parport/parport_pc.c for powerpc	2009-04-14 08:48:50 -07:00
pasemi_dma.h
pci-bridge.h	powerpc/pci: Cleanup some minor cruft	2009-05-21 15:44:24 +10:00
pci.h
percpu.h
perf_counter.h	perf_counter: powerpc: Implement generalized cache events for POWER processors	2009-06-11 16:48:37 +02:00
pgalloc-32.h
pgalloc-64.h
pgalloc.h
pgtable-ppc32.h	powerpc: Fix up dma_alloc_coherent() on platforms without cache coherency.	2009-05-27 16:33:59 +10:00
pgtable-ppc64-4k.h
pgtable-ppc64-64k.h
pgtable-ppc64.h	powerpc: Shield code specific to 64-bit server processors	2009-06-09 16:47:38 +10:00
pgtable.h
phyp_dump.h
pmac_feature.h
pmac_low_i2c.h
pmac_pfunc.h
pmc.h
pmi.h
poll.h
posix_types.h
ppc-opcode.h	powerpc: Add 2.06 tlbie mnemonics	2009-05-21 15:44:21 +10:00
ppc-pci.h
ppc4xx.h
ppc_asm.h	powerpc: Move VSX load/stores into ppc-opcode.h	2009-05-21 15:44:21 +10:00
processor.h
prom.h
ps3.h	powerpc/ps3: Add rtc-ps3	2009-04-02 01:05:32 +00:00
ps3av.h
ps3fb.h	powerpc: Remove duplicated #include's	2009-04-07 15:18:58 +10:00
ps3stor.h
pSeries_reconfig.h
pte-8xx.h
pte-40x.h
pte-44x.h
pte-common.h	powerpc: Fix oops when loading modules	2009-04-07 15:19:01 +10:00
pte-fsl-booke.h
pte-hash32.h
pte-hash64-4k.h
pte-hash64-64k.h
pte-hash64.h
ptrace.h	powerpc: Add PTRACE_SINGLEBLOCK support	2009-06-09 13:29:25 +10:00
qe.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-06-15 09:40:05 -07:00
qe_ic.h
reg.h	perf_counter: powerpc: supply more precise information on counter overflow events	2009-05-15 16:38:57 +02:00
reg_8xx.h
reg_booke.h	powerpc: Move SPEFSCR defines to common header	2009-04-02 10:41:31 -05:00
reg_fsl_emb.h
resource.h
rheap.h
rio.h
rtas.h	powerpc/pseries: Scan for all events in rtasd	2009-04-07 15:18:59 +10:00
rtc.h
rwsem.h
scatterlist.h	powerpc: Use sg->dma_length in sg_dma_len() macro on 32-bit	2009-05-21 15:44:25 +10:00
seccomp.h
sections.h
sembuf.h
serial.h
setjmp.h
setup.h
sfp-machine.h	powerpc/math-emu: Change types to work on ppc64	2009-04-02 16:17:36 -05:00
shmbuf.h
shmparam.h
sigcontext.h
siginfo.h
signal.h	asm-generic: rename termios.h, signal.h and mman.h	2009-06-11 21:01:52 +02:00
smp.h
smu.h
socket.h
sockios.h
sparsemem.h
spinlock.h	Allow rwlocks to re-enable interrupts	2009-04-02 19:05:11 -07:00
spinlock_types.h
spu.h
spu_csa.h
spu_info.h
spu_priv1.h
sstep.h
stat.h
statfs.h
string.h
suspend.h	pm: cleanup includes	2009-04-01 08:59:16 -07:00
swab.h
swiotlb.h	powerpc: Add support for swiotlb on 32-bit	2009-06-09 16:49:18 +10:00
synch.h
syscall.h
syscalls.h
systbl.h	Merge commit 'v2.6.30-rc1' into perfcounters/core	2009-04-08 10:35:30 +02:00
system.h	powerpc: Set init_bootmem_done on NUMA platforms as well	2009-06-09 16:43:04 +10:00
tce.h
termbits.h
termios.h	asm-generic: rename termios.h, signal.h and mman.h	2009-06-11 21:01:52 +02:00
thread_info.h
time.h
timex.h
tlb.h
tlbflush.h
topology.h	cpumask: remove node_to_first_cpu	2009-03-30 22:05:12 +10:30
tsi108.h
tsi108_irq.h
tsi108_pci.h
types.h	asm-generic: introduce asm/bitsperlong.h	2009-06-11 21:02:14 +02:00
uaccess.h
ucc.h
ucc_fast.h
ucc_slow.h
ucontext.h
udbg.h
uic.h
unaligned.h
uninorth.h
unistd.h	Merge commit 'v2.6.30-rc1' into perfcounters/core	2009-04-08 10:35:30 +02:00
user.h
vdso.h
vdso_datapage.h
vga.h
vio.h
xilinx_intc.h
xilinx_pci.h	powerpc/virtex: Add support for Xilinx PCI host bridge	2009-06-06 10:14:22 -06:00
xmon.h
xor.h