FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-21 00:42:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
42cb891295
linux/drivers/cdrom
History
Linus Torvalds 22a3e233ca Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 
* 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
2006-06-30 15:39:30 -07:00
..
aztcd.c [PATCH] devfs: Remove the gendisk devfs_name field as it's no longer needed 2006-06-26 12:25:08 -07:00
aztcd.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
cdrom.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
cdu31a.c [PATCH] devfs: Remove the devfs_fs_kernel.h file from the tree 2006-06-26 12:25:08 -07:00
cdu31a.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
cm206.c [PATCH] drivers/cdrom/cm206.c: cleanups 2006-06-30 11:25:38 -07:00
cm206.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
gscd.c [PATCH] devfs: Remove the gendisk devfs_name field as it's no longer needed 2006-06-26 12:25:08 -07:00
gscd.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
isp16.c [PATCH] Update CREDITS entry and listings in source files for Jesper Juhl 2005-07-27 16:26:20 -07:00
isp16.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
Kconfig Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
Makefile Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
mcdx.c [PATCH] devfs: Remove the devfs_fs_kernel.h file from the tree 2006-06-26 12:25:08 -07:00
mcdx.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
optcd.c [PATCH] devfs: Remove the gendisk devfs_name field as it's no longer needed 2006-06-26 12:25:08 -07:00
optcd.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
sbpcd.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
sbpcd.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
sjcd.c [PATCH] devfs: Remove the gendisk devfs_name field as it's no longer needed 2006-06-26 12:25:08 -07:00
sjcd.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
sonycd535.c [PATCH] devfs: Remove the gendisk devfs_name field as it's no longer needed 2006-06-26 12:25:08 -07:00
sonycd535.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
viocd.c [PATCH] devfs: Last little devfs cleanups throughout the kernel tree. 2006-06-26 12:25:09 -07:00