diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2017-01-26 16:56:31 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2017-01-26 16:56:31 +0100 |
| commit | a41dfe799a22a5da7e59ac5743be3d5338b6d373 (patch) | |
| tree | f2db91257d9ec58b6074ae69ec1bcf80e151314d /Documentation | |
| parent | 3655a1ca6bd8e7300f2bb196208d5139aa6b2eda (diff) | |
| parent | 0c744ea4f77d72b3dcebb7a8f2684633ec79be88 (diff) | |
| download | linux-stable-a41dfe799a22a5da7e59ac5743be3d5338b6d373.tar.gz linux-stable-a41dfe799a22a5da7e59ac5743be3d5338b6d373.tar.bz2 linux-stable-a41dfe799a22a5da7e59ac5743be3d5338b6d373.zip | |
Merge tag 'v4.10-rc2' into devel
Linux 4.10-rc2
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/DocBook/Makefile | 2 | ||||
| -rw-r--r-- | Documentation/unaligned-memory-access.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile index c75e5d6b8fa8..a6eb7dcd4dd5 100644 --- a/Documentation/DocBook/Makefile +++ b/Documentation/DocBook/Makefile @@ -12,7 +12,7 @@ DOCBOOKS := z8530book.xml \ kernel-api.xml filesystems.xml lsm.xml kgdb.xml \ gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \ genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \ - 80211.xml sh.xml regulator.xml w1.xml \ + sh.xml regulator.xml w1.xml \ writing_musb_glue_layer.xml iio.xml ifeq ($(DOCBOOKS),) diff --git a/Documentation/unaligned-memory-access.txt b/Documentation/unaligned-memory-access.txt index a445da098bc6..3f76c0c37920 100644 --- a/Documentation/unaligned-memory-access.txt +++ b/Documentation/unaligned-memory-access.txt @@ -151,7 +151,7 @@ bool ether_addr_equal(const u8 *addr1, const u8 *addr2) #else const u16 *a = (const u16 *)addr1; const u16 *b = (const u16 *)addr2; - return ((a[0] ^ b[0]) | (a[1] ^ b[1]) | (a[2] ^ b[2])) != 0; + return ((a[0] ^ b[0]) | (a[1] ^ b[1]) | (a[2] ^ b[2])) == 0; #endif } |