diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-01 00:33:04 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-01 00:33:04 +0200 |
| commit | ec7a19bfec544aa73e347369232f9bd654954aa3 (patch) | |
| tree | ecb7317f9941f3a3976f38883bdd9df6e4f1c8f7 /net/netlabel/netlabel_cipso_v4.h | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s39... (diff) | |
| parent | powerpc/kvm/book3s_32: Fix MTMSR_EERI macro (diff) | |
| download | linux-ec7a19bfec544aa73e347369232f9bd654954aa3.tar.xz linux-ec7a19bfec544aa73e347369232f9bd654954aa3.zip | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
Pull powerpc updates from Benjamin Herrenschmidt:
"Kumar sent me a handful of Freescale related fixes and I added another
regression fix to the pile.
PS. I -will- eventually learn about that signed tag business :-)"
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc/kvm/book3s_32: Fix MTMSR_EERI macro
powerpc/85xx: p1022ds: fix DIU/LBC switching with NAND enabled
powerpc/85xx: p1022ds: disable the NAND flash node if video is enabled
powerpc/85xx: Fix sram_offset parameter type
powerpc/85xx: P3041DS - change espi input-clock from 40MHz to 35MHz
powerpc/85xx: Fix pci base address error for p2020rdb-pc in dts
Diffstat (limited to 'net/netlabel/netlabel_cipso_v4.h')
0 files changed, 0 insertions, 0 deletions