Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b8bd54d authored Dec 17, 2008 by Linus Torvalds

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
  STAGING: Move staging drivers back to staging-specific menu
  driver core: add newlines to debugging enabled/disabled messages
  xilinx_hwicap: remove improper wording in license statement
  driver core: fix using 'ret' variable in unregister_dynamic_debug_module

parents 331c3135 4b4cdf39

drivers/char/xilinx_hwicap/buffer_icap.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -21,9 +21,6 @@
		* INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
		* FOR A PARTICULAR PURPOSE.
		*
		* Xilinx products are not intended for use in life support appliances,
		* devices, or systems. Use in such applications is expressly prohibited.
		*
		* (c) Copyright 2003-2008 Xilinx Inc.
		* All rights reserved.
		*

drivers/char/xilinx_hwicap/buffer_icap.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -21,9 +21,6 @@
		* INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
		* FOR A PARTICULAR PURPOSE.
		*
		* Xilinx products are not intended for use in life support appliances,
		* devices, or systems. Use in such applications is expressly prohibited.
		*
		* (c) Copyright 2003-2008 Xilinx Inc.
		* All rights reserved.
		*

drivers/char/xilinx_hwicap/fifo_icap.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -21,9 +21,6 @@
		* INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
		* FOR A PARTICULAR PURPOSE.
		*
		* Xilinx products are not intended for use in life support appliances,
		* devices, or systems. Use in such applications is expressly prohibited.
		*
		* (c) Copyright 2007-2008 Xilinx Inc.
		* All rights reserved.
		*

drivers/char/xilinx_hwicap/fifo_icap.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -21,9 +21,6 @@
		* INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
		* FOR A PARTICULAR PURPOSE.
		*
		* Xilinx products are not intended for use in life support appliances,
		* devices, or systems. Use in such applications is expressly prohibited.
		*
		* (c) Copyright 2007-2008 Xilinx Inc.
		* All rights reserved.
		*

drivers/char/xilinx_hwicap/xilinx_hwicap.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -21,9 +21,6 @@
		* INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
		* FOR A PARTICULAR PURPOSE.
		*
		* Xilinx products are not intended for use in life support appliances,
		* devices, or systems. Use in such applications is expressly prohibited.
		*
		* (c) Copyright 2002 Xilinx Inc., Systems Engineering Group
		* (c) Copyright 2004 Xilinx Inc., Systems Engineering Group
		* (c) Copyright 2007-2008 Xilinx Inc.