Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-15 00:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
bac5e54c29
linux/drivers/staging
History
Linus Torvalds bac5e54c29 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (38 commits)
  direct I/O fallback sync simplification
  ocfs: stop using do_sync_mapping_range
  cleanup blockdev_direct_IO locking
  make generic_acl slightly more generic
  sanitize xattr handler prototypes
  libfs: move EXPORT_SYMBOL for d_alloc_name
  vfs: force reval of target when following LAST_BIND symlinks (try #7)
  ima: limit imbalance msg
  Untangling ima mess, part 3: kill dead code in ima
  Untangling ima mess, part 2: deal with counters
  Untangling ima mess, part 1: alloc_file()
  O_TRUNC open shouldn't fail after file truncation
  ima: call ima_inode_free ima_inode_free
  IMA: clean up the IMA counts updating code
  ima: only insert at inode creation time
  ima: valid return code from ima_inode_alloc
  fs: move get_empty_filp() deffinition to internal.h
  Sanitize exec_permission_lite()
  Kill cached_lookup() and real_lookup()
  Kill path_lookup_open()
  ...

Trivial conflicts in fs/direct-io.c
2009-12-16 12:04:02 -08:00
..
altpciechdma Staging: fix assorted typos all over the place 2009-12-11 12:23:20 -08:00
arlan Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2009-12-08 07:55:01 -08:00
asus_oled Staging: asus_oled: Cleaned up checkpatch issues. 2009-09-15 12:02:33 -07:00
b3dfg Staging: b3dfg: remove check for pci bus master 2009-12-11 12:21:46 -08:00
batman-adv Staging: batman: fix debug Kconfig option 2009-12-11 15:49:27 -08:00
comedi Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2009-12-11 15:25:56 -08:00
cx25821 V4L/DVB (13556): v4l: Remove unneeded video_device::minor assignments 2009-12-16 00:17:57 -02:00
dream Staging: dream: add gpio and pmem support 2009-12-11 12:23:21 -08:00
dst fix the crap in dst/dcore 2009-12-16 12:16:44 -05:00
echo Staging: echo: coding style cleanups 2009-09-15 12:02:16 -07:00
et131x Staging: et131x: clean up the avail fields in the rx registers 2009-12-11 12:23:21 -08:00
frontier Staging: remove unused #include <linux/version.h>'s 2009-06-19 11:00:36 -07:00
go7007 V4L/DVB (13556): v4l: Remove unneeded video_device::minor assignments 2009-12-16 00:17:57 -02:00
hv Staging: fix assorted typos all over the place 2009-12-11 12:23:20 -08:00
iio Staging: IIO: add selection of IIO_SW_RING to LIS3L02DQ as needed 2009-12-11 12:23:23 -08:00
line6 staging: line6: Convert simple_strtoul to strict_strtoul in midi.c 2009-12-11 12:21:48 -08:00
mimio
netwave Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ 2009-12-05 15:22:26 -08:00
octeon Staging: fix assorted typos all over the place 2009-12-11 12:23:20 -08:00
otus Staging: fix assorted typos all over the place 2009-12-11 12:23:20 -08:00
p9auth Staging: p9auth: adding __init/__exit macros 2009-12-11 12:23:04 -08:00
panel Staging: Panel: prevent driver from calling misc_deregister twice on same ressource 2009-10-30 14:47:43 -07:00
phison Staging: phison: adding __init/__exit macros 2009-12-11 12:23:05 -08:00
poch Staging: poch: Add sample Rx code 2009-12-11 12:23:09 -08:00
pohmelfs writeback: remove unused nonblocking and congestion checks 2009-12-03 13:54:25 +01:00
quatech_usb2 Staging: fix assorted typos all over the place 2009-12-11 12:23:20 -08:00
ramzswap Staging: ramzswap: add TODO file 2009-12-11 12:23:04 -08:00
rar Staging: fix assorted typos all over the place 2009-12-11 12:23:20 -08:00
rt2860 Staging: fix assorted typos all over the place 2009-12-11 12:23:20 -08:00
rt2870 Staging: rt28x0: Add proper selection of WIRELESS_EXT and WEXT_PRIV 2009-12-11 12:23:16 -08:00
rt3070 Staging: rt28x0: remove typedefs (part one) 2009-12-11 12:23:15 -08:00
rt3090 Staging: rt28x0: remove typedefs (part one) 2009-12-11 12:23:15 -08:00
rtl8187se Staging: rtl8187se: Rename staging driver to avoid name conflict with mainline driver 2009-12-11 12:23:20 -08:00
rtl8192e Staging: fix assorted typos all over the place 2009-12-11 12:23:20 -08:00
rtl8192su Staging: fix assorted typos all over the place 2009-12-11 12:23:20 -08:00
rtl8192u Staging: rtl8192u: depends on USB 2009-12-11 12:23:22 -08:00
samsung-laptop Staging: samsung-laptop: add TODO file 2009-12-11 12:23:23 -08:00
sep Staging: fix assorted typos all over the place 2009-12-11 12:23:20 -08:00
serqt_usb2 Staging: fix assorted typos all over the place 2009-12-11 12:23:20 -08:00
slicoss Staging: slicoss: remove duplicate structure field initialization 2009-12-11 12:23:05 -08:00
strip Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 2009-11-09 11:17:24 -08:00
udlfb Staging: udlfb: fix printk format warning 2009-09-15 12:02:06 -07:00
usbip Staging: usbip: Fix typo "Contoroller". 2009-12-11 12:23:19 -08:00
vme staging: vme: Fix mutex locking 2009-12-11 12:23:18 -08:00
vt6655 Staging: fix assorted typos all over the place 2009-12-11 12:23:20 -08:00
vt6656 Staging: fix assorted typos all over the place 2009-12-11 12:23:20 -08:00
wavelan Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2009-12-09 19:43:33 -08:00
winbond Staging: wireless drivers Kconfig change 2009-10-30 14:47:44 -07:00
wlags49_h2 Staging: wlags49_h2: fix up signal levels 2009-12-11 12:23:23 -08:00
wlags49_h25 Staging: wlags49: fix kconfigs dependancy 2009-12-11 12:23:10 -08:00
wlan-ng Staging: wireless drivers Kconfig change 2009-10-30 14:47:44 -07:00
Kconfig Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2009-12-11 15:25:56 -08:00
Makefile Staging: add Samsung Laptop driver 2009-12-11 12:23:22 -08:00
staging.c