| #
7a996d3a |
| 04-Aug-2010 |
Michal Marek <mmarek@suse.cz> |
Merge commit 'v2.6.35' into kbuild/kconfig
Conflicts:
scripts/kconfig/Makefile
|
| #
772320e8 |
| 04-Aug-2010 |
Michal Marek <mmarek@suse.cz> |
Merge commit 'v2.6.35' into kbuild/kbuild
Conflicts:
arch/powerpc/Makefile
|
|
Revision tags: v2.6.35 |
|
| #
800f65bb |
| 27-Jul-2010 |
John W. Linville <linville@tuxdriver.com> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-commands.h
|
|
Revision tags: v2.6.35-rc6, v2.6.35-rc5, v2.6.35-rc4 |
|
| #
2dcf78c0 |
| 30-Jun-2010 |
Uwe Kleine-König <u.kleine-koenig@pengutronix.de> |
Merge branch 'imx/for-2.6.36' of git://git.pengutronix.de/git/ukl/linux-2.6 into HEAD
There are some more conflicts than detected by git, namely support for
the newly added cpuimx machines needed to
Merge branch 'imx/for-2.6.36' of git://git.pengutronix.de/git/ukl/linux-2.6 into HEAD
There are some more conflicts than detected by git, namely support for
the newly added cpuimx machines needed to be converted to dynamic device
registration.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Conflicts:
arch/arm/mach-imx/Makefile
arch/arm/mach-imx/devices.c
arch/arm/mach-imx/devices.h
arch/arm/mach-imx/eukrea_mbimx27-baseboard.c
arch/arm/mach-mx2/Kconfig
arch/arm/mach-mx25/Makefile
arch/arm/mach-mx25/devices.c
arch/arm/plat-mxc/include/mach/mx25.h
arch/arm/plat-mxc/include/mach/mxc_nand.h
show more ...
|
| #
c67dda14 |
| 26-Jun-2010 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
|
| #
f1bbbb69 |
| 16-Jun-2010 |
Jiri Kosina <jkosina@suse.cz> |
Merge branch 'master' into for-next
|
|
Revision tags: v2.6.35-rc3, v2.6.35-rc2 |
|
| #
d8a382d2 |
| 04-Jun-2010 |
Robert Richter <robert.richter@amd.com> |
Merge remote branch 'tip/perf/urgent' into oprofile/urgent
|
| #
b42f5b0f |
| 01-Jun-2010 |
Len Brown <len.brown@intel.com> |
Merge branches 'bugzilla-14668' and 'misc-2.6.35' into release
|
| #
b4ca7615 |
| 01-Jun-2010 |
Jens Axboe <jaxboe@fusionio.com> |
Merge branch 'master' into for-linus
Conflicts:
fs/pipe.c
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
|
| #
1d61e73a |
| 01-Jun-2010 |
Joerg Roedel <joerg.roedel@amd.com> |
Merge commit 'v2.6.35-rc1' into amd-iommu/2.6.35
|
| #
64960848 |
| 31-May-2010 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
|
| #
e37c83c0 |
| 31-May-2010 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
Merge commit 'v2.6.35-rc1' into for-2.6.36
|
| #
d5b732b1 |
| 30-May-2010 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
| #
8fa76f7e |
| 30-May-2010 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
|
Revision tags: v2.6.35-rc1 |
|
| #
63a64403 |
| 26-May-2010 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus
* git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus:
squashfs: update documentation to include description of
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus
* git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus:
squashfs: update documentation to include description of xattr layout
squashfs: fix name reading in squashfs_xattr_get
squashfs: constify xattr handlers
squashfs: xattr fix sparse warnings
squashfs: xattr_lookup sparse fix
squashfs: add xattr support configure option
squashfs: add new extended inode types
squashfs: add support for xattr reading
squashfs: add xattr id support
show more ...
|
|
Revision tags: v2.6.34 |
|
| #
aa5b1894 |
| 13-May-2010 |
Stephen Hemminger <shemminger@vyatta.com> |
squashfs: xattr_lookup sparse fix
Sparse detected that unsigned pointer was being passed as int pointer.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
[fixed up to deal with code refacto
squashfs: xattr_lookup sparse fix
Sparse detected that unsigned pointer was being passed as int pointer.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
[fixed up to deal with code refactoring]
Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
show more ...
|
| #
4b5397dc |
| 14-May-2010 |
Phillip Lougher <phillip@lougher.demon.co.uk> |
squashfs: add xattr id support
This patch adds support for mapping xattr ids (stored in inodes)
into the on-disk location of the xattrs themselves.
Signed-off-by: Phillip Lougher <phillip@lougher.d
squashfs: add xattr id support
This patch adds support for mapping xattr ids (stored in inodes)
into the on-disk location of the xattrs themselves.
Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
show more ...
|