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

Commit 2e31add2 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'x86/urgent' into x86/pat

parents d639bab8 17581ad8

.mailmap

+3 −1
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ Rudolf Marek <R.Marek@sh.cvut.cz> 
Rui Saraiva <rmps@joel.ist.utl.pt>

Sachin P Sant <ssant@in.ibm.com>

Sam Ravnborg <sam@mars.ravnborg.org>

Sascha Hauer <s.hauer@pengutronix.de>

S.Çağlar Onur <caglar@pardus.org.tr>

Simon Kelley <simon@thekelleys.org.uk>

Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
@@ -100,6 +101,7 @@ Tejun Heo <htejun@gmail.com> 
Thomas Graf <tgraf@suug.ch>

Tony Luck <tony.luck@intel.com>

Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>

Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>

Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>

Uwe Kleine-König <ukl@pengutronix.de>

Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>

Valdis Kletnieks <Valdis.Kletnieks@vt.edu>

CREDITS

+0 −1
Original line number Diff line number Diff line
@@ -2166,7 +2166,6 @@ D: Initial implementation of VC's, pty's and select() 


N: Pavel Machek

E: pavel@ucw.cz

E: pavel@suse.cz

D: Softcursor for vga, hypertech cdrom support, vcsa bugfix, nbd

D: sun4/330 port, capabilities for elf, speedup for rm on ext2, USB,

D: work on suspend-to-ram/disk, killing duplicates from ioctl32

Documentation/ABI/testing/sysfs-firmware-memmap

+1 −1
Original line number Diff line number Diff line 
What:		/sys/firmware/memmap/

Date:		June 2008

Contact:	Bernhard Walle <bwalle@suse.de>

Contact:	Bernhard Walle <bernhard.walle@gmx.de>

Description:

		On all platforms, the firmware provides a memory map which the

		kernel reads. The resources from that memory map are registered

Documentation/Changes

+3 −1
Original line number Diff line number Diff line
@@ -33,10 +33,12 @@ o Gnu make 3.79.1 # make --version 
o  binutils               2.12                    # ld -v

o  util-linux             2.10o                   # fdformat --version

o  module-init-tools      0.9.10                  # depmod -V

o  e2fsprogs              1.29                    # tune2fs

o  e2fsprogs              1.41.4                  # e2fsck -V

o  jfsutils               1.1.3                   # fsck.jfs -V

o  reiserfsprogs          3.6.3                   # reiserfsck -V 2>&1|grep reiserfsprogs

o  xfsprogs               2.6.0                   # xfs_db -V

o  squashfs-tools         4.0                     # mksquashfs -version

o  btrfs-progs            0.18                    # btrfsck

o  pcmciautils            004                     # pccardctl -V

o  quota-tools            3.09                    # quota -V

o  PPP                    2.4.0                   # pppd --version

Documentation/CodingStyle

+13 −5
Original line number Diff line number Diff line
@@ -483,17 +483,25 @@ values. To do the latter, you can stick the following in your .emacs file: 
    (* (max steps 1)

       c-basic-offset)))



(add-hook 'c-mode-common-hook

          (lambda ()

            ;; Add kernel style

            (c-add-style

             "linux-tabs-only"

             '("linux" (c-offsets-alist

                        (arglist-cont-nonempty

                         c-lineup-gcc-asm-reg

                         c-lineup-arglist-tabs-only))))))



(add-hook 'c-mode-hook

          (lambda ()

            (let ((filename (buffer-file-name)))

              ;; Enable kernel mode for the appropriate files

              (when (and filename

                         (string-match "~/src/linux-trees" filename))

                         (string-match (expand-file-name "~/src/linux-trees")

                                       filename))

                (setq indent-tabs-mode t)

                (c-set-style "linux")

                (c-set-offset 'arglist-cont-nonempty

                              '(c-lineup-gcc-asm-reg

                                c-lineup-arglist-tabs-only))))))

                (c-set-style "linux-tabs-only")))))



This will make emacs go better with the kernel coding style for C

files below ~/src/linux-trees.