apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

Browse Source 
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
  Remove obsolete #include <linux/config.h>
  remove obsolete swsusp_encrypt
  arch/arm26/Kconfig typos
  Documentation/IPMI typos
  Kconfig: Typos in net/sched/Kconfig
  v9fs: do not include linux/version.h
  Documentation/DocBook/mtdnand.tmpl: typo fixes
  typo fixes: specfic -> specific
  typo fixes in Documentation/networking/pktgen.txt
  typo fixes: occuring -> occurring
  typo fixes: infomation -> information
  typo fixes: disadvantadge -> disadvantage
  typo fixes: aquire -> acquire
  typo fixes: mecanism -> mechanism
  typo fixes: bandwith -> bandwidth
  fix a typo in the RTC_CLASS help text
  smb is no longer maintained

Manually merged trivial conflict in arch/um/kernel/vmlinux.lds.S
This commit is contained in:
Linus Torvalds
2006-06-30 15:39:30 -07:00
parent 39302175c2 6ab3d5624e
commit 22a3e233ca
3018 changed files with 95 additions and 3092 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/ide/arm/icside.c
-1
View File
@@ -6,7 +6,6 @@
* Please note that this platform does not support 32-bit IDE IO.
*/
#include <linux/config.h>
#include <linux/string.h>
#include <linux/module.h>
#include <linux/ioport.h>
drivers/ide/cris/ide-cris.c
-1
View File
@@ -19,7 +19,6 @@
#undef REALLY_SLOW_IO /* most systems can safely undef this */
#include <linux/config.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/timer.h>
drivers/ide/h8300/ide-h8300.c
-1
View File
@@ -5,7 +5,6 @@
#include <linux/init.h>
#include <linux/ide.h>
#include <linux/config.h>
#include <asm/io.h>
#include <asm/irq.h>
drivers/ide/ide-cd.c
-1
View File
@@ -301,7 +301,6 @@
#define IDECD_VERSION "4.61"
#include <linux/config.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/kernel.h>
drivers/ide/ide-disk.c
-1
View File
@@ -47,7 +47,6 @@
//#define DEBUG
#include <linux/config.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/string.h>
drivers/ide/ide-dma.c
-1
View File
@@ -74,7 +74,6 @@
*
*/
#include <linux/config.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/kernel.h>
drivers/ide/ide-floppy.c
-1
View File
@@ -82,7 +82,6 @@
#define IDEFLOPPY_VERSION "0.99.newide"
#include <linux/config.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/string.h>
drivers/ide/ide-io.c
-1
View File
@@ -24,7 +24,6 @@
*/
#include <linux/config.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/string.h>
drivers/ide/ide-iops.c
-1
View File
@@ -6,7 +6,6 @@
*
*/
#include <linux/config.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/string.h>
drivers/ide/ide-lib.c
-1
View File
@@ -1,4 +1,3 @@
#include <linux/config.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/string.h>
drivers/ide/ide-probe.c
-1
View File
@@ -33,7 +33,6 @@
#undef REALLY_SLOW_IO /* most systems can safely undef this */
#include <linux/config.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/string.h>
drivers/ide/ide-proc.c
-1
View File
@@ -22,7 +22,6 @@
*
*/
#include <linux/config.h>
#include <linux/module.h>
#include <asm/uaccess.h>
drivers/ide/ide-tape.c
-1
View File
@@ -424,7 +424,6 @@
#define IDETAPE_VERSION "1.19"
#include <linux/config.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/string.h>
drivers/ide/ide-taskfile.c
-1
View File
@@ -27,7 +27,6 @@
* request.
*/
#include <linux/config.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/string.h>
drivers/ide/ide.c
-1
View File
@@ -130,7 +130,6 @@
#define _IDE_C /* Tell ide.h it's really us */
#include <linux/config.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/string.h>
drivers/ide/legacy/ali14xx.c
-1
View File
@@ -40,7 +40,6 @@
#undef REALLY_SLOW_IO /* most systems can safely undef this */
#include <linux/module.h>
#include <linux/config.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/delay.h>
drivers/ide/legacy/dtc2278.c
-1
View File
@@ -7,7 +7,6 @@
#undef REALLY_SLOW_IO /* most systems can safely undef this */
#include <linux/module.h>
#include <linux/config.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/delay.h>
drivers/ide/legacy/gayle.c
-1
View File
@@ -8,7 +8,6 @@
* more details.
*/
#include <linux/config.h>
#include <linux/types.h>
#include <linux/mm.h>
#include <linux/interrupt.h>
drivers/ide/legacy/ht6560b.c
-1
View File
@@ -39,7 +39,6 @@
#undef REALLY_SLOW_IO /* most systems can safely undef this */
#include <linux/module.h>
#include <linux/config.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/delay.h>
drivers/ide/legacy/macide.c
-1
View File
@@ -11,7 +11,6 @@
* more details.
*/
#include <linux/config.h>
#include <linux/types.h>
#include <linux/mm.h>
#include <linux/interrupt.h>

Some files were not shown because too many files have changed in this diff Show More