1
0
Fork 0
alistair23-linux/arch/um/drivers
Linus Torvalds 821f3eff7c Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: (40 commits)
  kbuild: introduce ccflags-y, asflags-y and ldflags-y
  kbuild: enable 'make CPPFLAGS=...' to add additional options to CPP
  kbuild: enable use of AFLAGS and CFLAGS on commandline
  kbuild: enable 'make AFLAGS=...' to add additional options to AS
  kbuild: fix AFLAGS use in h8300 and m68knommu
  kbuild: check for wrong use of CFLAGS
  kbuild: enable 'make CFLAGS=...' to add additional options to CC
  kbuild: fix up CFLAGS usage
  kbuild: make modpost detect unterminated device id lists
  kbuild: call export_report from the Makefile
  kbuild: move Kai Germaschewski to CREDITS
  kconfig/menuconfig: distinguish between selected-by-another options and comments
  kconfig: tristate choices with mixed tristate and boolean values
  include/linux/Kbuild: remove duplicate entries
  kbuild: kill backward compatibility checks
  kbuild: kill EXTRA_ARFLAGS
  kbuild: fix documentation in makefiles.txt
  kbuild: call make once for all targets when O=.. is used
  kbuild: pass -g to assembler under CONFIG_DEBUG_INFO
  kbuild: update _shipped files for kconfig syntax cleanup
  ...

Fix up conflicts in arch/um/sys-{x86_64,i386}/Makefile manually.
2007-10-16 11:23:06 -07:00
..
Makefile Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild 2007-10-16 11:23:06 -07:00
chan_kern.c uml: fix console writing bugs 2007-10-16 09:43:04 -07:00
chan_user.c uml: arch/um/drivers formatting 2007-10-16 09:43:09 -07:00
cow.h [PATCH] uml: avoid warnings for diffent names for an unsigned quadword 2006-04-11 06:18:37 -07:00
cow_sys.h uml: Eliminate kernel allocator wrappers 2007-07-16 09:05:38 -07:00
cow_user.c uml: arch/um/drivers formatting 2007-10-16 09:43:09 -07:00
daemon.h uml: network formatting 2007-10-16 09:43:08 -07:00
daemon_kern.c uml: network driver MTU cleanups 2007-10-16 09:43:08 -07:00
daemon_user.c uml: network driver MTU cleanups 2007-10-16 09:43:08 -07:00
fd.c uml: arch/um/drivers formatting 2007-10-16 09:43:09 -07:00
harddog_kern.c uml: fix nonremovability of watchdog 2007-10-16 09:43:04 -07:00
harddog_user.c uml: remove os_* usage from userspace files 2007-10-16 09:43:06 -07:00
hostaudio_kern.c uml: arch/um/drivers formatting 2007-10-16 09:43:09 -07:00
line.c uml: console tidying 2007-10-16 09:43:04 -07:00
mcast.h uml: network formatting 2007-10-16 09:43:08 -07:00
mcast_kern.c uml: network driver MTU cleanups 2007-10-16 09:43:08 -07:00
mcast_user.c uml: network driver MTU cleanups 2007-10-16 09:43:08 -07:00
mconsole_kern.c uml: more idiomatic parameter parsing 2007-10-16 09:43:08 -07:00
mconsole_user.c uml: arch/um/drivers formatting 2007-10-16 09:43:09 -07:00
mmapper_kern.c uml: arch/um/drivers formatting 2007-10-16 09:43:09 -07:00
net_kern.c uml: correctly handle skb allocation failures 2007-10-16 09:43:08 -07:00
net_user.c uml: network formatting 2007-10-16 09:43:08 -07:00
null.c uml: arch/um/drivers formatting 2007-10-16 09:43:09 -07:00
pcap_kern.c uml: network driver MTU cleanups 2007-10-16 09:43:08 -07:00
pcap_user.c uml: network driver MTU cleanups 2007-10-16 09:43:08 -07:00
pcap_user.h [PATCH] missed const in prototype 2006-10-10 15:37:24 -07:00
port.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
port_kern.c uml: console subsystem tidying 2007-10-16 09:43:04 -07:00
port_user.c uml: console subsystem tidying 2007-10-16 09:43:04 -07:00
pty.c uml: arch/um/drivers formatting 2007-10-16 09:43:09 -07:00
random.c uml: rename os_{read_write}_file_k back to os_{read_write}_file 2007-05-07 12:13:03 -07:00
slip.h [PATCH] uml: const more data 2006-09-27 08:26:15 -07:00
slip_common.c [PATCH] uml: slirp and slip driver cleanups and fixes 2005-06-13 20:58:43 -07:00
slip_common.h [PATCH] uml: fix hugest stack users 2006-02-01 08:53:22 -08:00
slip_kern.c uml: network driver MTU cleanups 2007-10-16 09:43:08 -07:00
slip_user.c uml: network driver MTU cleanups 2007-10-16 09:43:08 -07:00
slirp.h [PATCH] uml: const more data 2006-09-27 08:26:15 -07:00
slirp_kern.c uml: network driver MTU cleanups 2007-10-16 09:43:08 -07:00
slirp_user.c uml: network driver MTU cleanups 2007-10-16 09:43:08 -07:00
ssl.c uml: handle errors on opening host side of consoles 2007-07-16 09:05:38 -07:00
ssl.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
stderr_console.c uml: get declaration of simple_strtoul 2007-06-08 17:23:33 -07:00
stdio_console.c uml: handle errors on opening host side of consoles 2007-07-16 09:05:38 -07:00
stdio_console.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
tty.c uml: console subsystem tidying 2007-10-16 09:43:04 -07:00
ubd_kern.c uml: remove unneeded void * cast 2007-10-16 09:43:07 -07:00
ubd_user.c uml: DEBUG_SHIRQ fixes 2007-07-16 09:05:38 -07:00
vde.h uml: add VDE networking support 2007-10-16 09:43:05 -07:00
vde_kern.c uml: network driver MTU cleanups 2007-10-16 09:43:08 -07:00
vde_user.c uml: network driver MTU cleanups 2007-10-16 09:43:08 -07:00
xterm.c uml: arch/um/drivers formatting 2007-10-16 09:43:09 -07:00
xterm.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
xterm_kern.c uml: xterm driver tidying 2007-07-16 09:05:38 -07:00