p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
linux_old1/arch/m32r/include/asm
History
Linus Torvalds d7e9660ad9 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: (1623 commits)
  netxen: update copyright
  netxen: fix tx timeout recovery
  netxen: fix file firmware leak
  netxen: improve pci memory access
  netxen: change firmware write size
  tg3: Fix return ring size breakage
  netxen: build fix for INET=n
  cdc-phonet: autoconfigure Phonet address
  Phonet: back-end for autoconfigured addresses
  Phonet: fix netlink address dump error handling
  ipv6: Add IFA_F_DADFAILED flag
  net: Add DEVTYPE support for Ethernet based devices
  mv643xx_eth.c: remove unused txq_set_wrr()
  ucc_geth: Fix hangs after switching from full to half duplex
  ucc_geth: Rearrange some code to avoid forward declarations
  phy/marvell: Make non-aneg speed/duplex forcing work for 88E1111 PHYs
  drivers/net/phy: introduce missing kfree
  drivers/net/wan: introduce missing kfree
  net: force bridge module(s) to be GPL
  Subject: [PATCH] appletalk: Fix skb leak when ipddp interface is not loaded
  ...

Fixed up trivial conflicts:

 - arch/x86/include/asm/socket.h

   converted to <asm-generic/socket.h> in the x86 tree.  The generic
   header has the same new #define's, so that works out fine.

 - drivers/net/tun.c

   fix conflict between 89f56d1e9 ("tun: reuse struct sock fields") that
   switched over to using 'tun->socket.sk' instead of the redundantly
   available (and thus removed) 'tun->sk', and 2b980dbd ("lsm: Add hooks
   to the TUN driver") which added a new 'tun->sk' use.

   Noted in 'next' by Stephen Rothwell.
 		2009-09-14 10:37:28 -07:00
..
m32104ut m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
m32700ut m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
mappi2 m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
mappi3 m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
opsput m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
Kbuild m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
addrspace.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
assembler.h m32r: use __stringify() macro in assembler.h 2009-05-02 22:38:21 +09:00
atomic.h asm-generic: rename atomic.h to atomic-long.h 2009-06-11 21:02:17 +02:00
auxvec.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
bitops.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
bitsperlong.h asm-generic: introduce asm/bitsperlong.h 2009-06-11 21:02:14 +02:00
bug.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
bugs.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
byteorder.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
cache.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
cachectl.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
cacheflush.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
checksum.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
cputime.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
current.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
delay.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
device.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
div64.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
dma.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
elf.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
emergency-restart.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
errno.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
fb.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
fcntl.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
flat.h flat: fix data sections alignment 2009-05-29 08:40:02 -07:00
ftrace.h m32r: move include/asm-m32r/* to arch/m32r/include/asm/ 2009-04-17 10:50:23 +09:00
futex.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
hardirq.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
hw_irq.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
io.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
ioctl.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
ioctls.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
ipcbuf.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
irq.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
irq_regs.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
kdebug.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
kmap_types.h kmap_types: make most arches use generic header file 2009-06-16 19:47:51 -07:00
linkage.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
local.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
m32r.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
m32r_mp_fpga.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
m32102.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
mc146818rtc.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
mman.h asm-generic: rename termios.h, signal.h and mman.h 2009-06-11 21:01:52 +02:00
mmu.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
mmu_context.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
mmzone.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
module.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
msgbuf.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
mutex.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
page.h asm-generic: rename page.h and uaccess.h 2009-06-11 21:02:17 +02:00
param.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
pci.h asm-generic: make pci.h usable directly 2009-06-11 21:02:22 +02:00
percpu.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
pgalloc.h mm: Pass virtual address to [__]p{te,ud,md}_free_tlb() 2009-07-27 12:10:38 -07:00
pgtable-2level.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
pgtable.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
poll.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
posix_types.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
processor.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
ptrace.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
resource.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
rtc.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
s1d13806.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
scatterlist.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
sections.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
segment.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
sembuf.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
serial.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
setup.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
shmbuf.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
shmparam.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
sigcontext.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
siginfo.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
signal.h asm-generic: rename termios.h, signal.h and mman.h 2009-06-11 21:01:52 +02:00
smp.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
socket.h net: implement a SO_DOMAIN getsockoption 2009-08-05 13:02:57 -07:00
sockios.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
spinlock.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
spinlock_types.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
stat.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
statfs.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
string.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
swab.h m32r: move include/asm-m32r/* to arch/m32r/include/asm/ 2009-04-17 10:50:23 +09:00
syscall.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
system.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
termbits.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
termios.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
thread_info.h KEYS: Extend TIF_NOTIFY_RESUME to (almost) all architectures [try #6] 2009-09-02 21:29:19 +10:00
timex.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
tlb.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
tlbflush.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
topology.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
types.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
uaccess.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
ucontext.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
unaligned.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
unistd.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
user.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
vga.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00
xor.h m32r: move include/asm-m32r headers to arch/m32r/include/asm 2009-04-17 10:05:01 +09:00