Merge commit 'v2.6.26' into bkl-removal
commit2fceef397f9880b212a74c418290ce69e7ac00eb
authorJonathan Corbet <corbet@lwn.net>
Mon, 14 Jul 2008 21:29:34 +0000 (14 15:29 -0600)
committerJonathan Corbet <corbet@lwn.net>
Mon, 14 Jul 2008 21:29:34 +0000 (14 15:29 -0600)
treed9cc09ab992825ef7fede4a688103503e3caf655
parentfeae1ef116ed381625d3731c5ae4f4ebcb3fa302
parentbce7f793daec3e65ec5c5705d2457b81fe7b5725
Merge commit 'v2.6.26' into bkl-removal
30 files changed:
block/bsg.c
drivers/char/agp/frontend.c
drivers/char/drm/drm_fops.c
drivers/char/ip2/ip2main.c
drivers/char/ipmi/ipmi_watchdog.c
drivers/char/rtc.c
drivers/char/tty_io.c
drivers/char/viotape.c
drivers/infiniband/core/user_mad.c
drivers/infiniband/core/uverbs_main.c
drivers/isdn/hardware/eicon/divasmain.c
drivers/isdn/i4l/isdn_common.c
drivers/macintosh/smu.c
drivers/media/video/videodev.c
drivers/net/tun.c
drivers/s390/char/vmlogrdr.c
drivers/sbus/char/bpp.c
drivers/scsi/3w-9xxx.c
drivers/scsi/ch.c
drivers/scsi/osst.c
drivers/scsi/sg.c
drivers/scsi/st.c
drivers/spi/spidev.c
drivers/uio/uio.c
fs/cifs/cifsfs.c
fs/fat/file.c
fs/nfs/file.c
fs/ocfs2/stack_user.c
include/linux/fs.h
sound/core/sound.c